[1/3] avformat: expose av_stream_new_side_data helper

Message ID 1446745744-22977-1-git-send-email-stebbins@jetheaddev.com
State New
Headers show

Commit Message

John Stebbins Nov. 5, 2015, 5:49 p.m.
---
 libavformat/avformat.h   | 10 ++++++++++
 libavformat/internal.h   |  7 -------
 libavformat/mov.c        |  4 ++--
 libavformat/replaygain.c |  2 +-
 libavformat/utils.c      |  3 ++-
 5 files changed, 15 insertions(+), 11 deletions(-)

Comments

Luca Barbato Nov. 5, 2015, 10:47 p.m. | #1
On 05/11/15 18:49, John Stebbins wrote:
> ---
>  libavformat/avformat.h   | 10 ++++++++++
>  libavformat/internal.h   |  7 -------
>  libavformat/mov.c        |  4 ++--
>  libavformat/replaygain.c |  2 +-
>  libavformat/utils.c      |  3 ++-
>  5 files changed, 15 insertions(+), 11 deletions(-)

Sounds fine for me.

lu

Patch

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 470bbc6..18cef52 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1336,6 +1336,16 @@  const AVClass *avformat_get_class(void);
 AVStream *avformat_new_stream(AVFormatContext *s, const AVCodec *c);
 
 /**
+ * Allocate new information from stream.
+ *
+ * @param stream stream
+ * @param type desired side information type
+ * @param size side information size
+ * @return pointer to fresh allocated data or NULL otherwise
+ */
+uint8_t *av_stream_new_side_data(AVStream *stream,
+                                 enum AVPacketSideDataType type, int size);
+/**
  * Get side information from stream.
  *
  * @param stream stream
diff --git a/libavformat/internal.h b/libavformat/internal.h
index a65a3b7..738db04 100644
--- a/libavformat/internal.h
+++ b/libavformat/internal.h
@@ -407,11 +407,4 @@  static inline int ff_rename(const char *oldpath, const char *newpath)
     return 0;
 }
 
-/**
- * Add new side data to a stream. If a side data of this type already exists, it
- * is replaced.
- */
-uint8_t *ff_stream_new_side_data(AVStream *st, enum AVPacketSideDataType type,
-                                 int size);
-
 #endif /* AVFORMAT_INTERNAL_H */
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 9532213..4593bbb 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -681,7 +681,7 @@  static int mov_read_dac3(MOVContext *c, AVIOContext *pb, MOVAtom atom)
         return 0;
     st = c->fc->streams[c->fc->nb_streams-1];
 
-    ast = (enum AVAudioServiceType*)ff_stream_new_side_data(st, AV_PKT_DATA_AUDIO_SERVICE_TYPE,
+    ast = (enum AVAudioServiceType*)av_stream_new_side_data(st, AV_PKT_DATA_AUDIO_SERVICE_TYPE,
                                                             sizeof(*ast));
     if (!ast)
         return AVERROR(ENOMEM);
@@ -713,7 +713,7 @@  static int mov_read_dec3(MOVContext *c, AVIOContext *pb, MOVAtom atom)
         return 0;
     st = c->fc->streams[c->fc->nb_streams-1];
 
-    ast = (enum AVAudioServiceType*)ff_stream_new_side_data(st, AV_PKT_DATA_AUDIO_SERVICE_TYPE,
+    ast = (enum AVAudioServiceType*)av_stream_new_side_data(st, AV_PKT_DATA_AUDIO_SERVICE_TYPE,
                                                             sizeof(*ast));
     if (!ast)
         return AVERROR(ENOMEM);
diff --git a/libavformat/replaygain.c b/libavformat/replaygain.c
index 98e7aad..3188b15 100644
--- a/libavformat/replaygain.c
+++ b/libavformat/replaygain.c
@@ -75,7 +75,7 @@  int ff_replaygain_export_raw(AVStream *st, int32_t tg, uint32_t tp,
     if (tg == INT32_MIN && ag == INT32_MIN)
         return 0;
 
-    replaygain = (AVReplayGain*)ff_stream_new_side_data(st, AV_PKT_DATA_REPLAYGAIN,
+    replaygain = (AVReplayGain*)av_stream_new_side_data(st, AV_PKT_DATA_REPLAYGAIN,
                                                         sizeof(*replaygain));
     if (!replaygain)
         return AVERROR(ENOMEM);
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 42f60d5..52c42fa 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3120,7 +3120,7 @@  uint8_t *av_stream_get_side_data(AVStream *st, enum AVPacketSideDataType type,
     return NULL;
 }
 
-uint8_t *ff_stream_new_side_data(AVStream *st, enum AVPacketSideDataType type,
+uint8_t *av_stream_new_side_data(AVStream *st, enum AVPacketSideDataType type,
                                  int size)
 {
     AVPacketSideData *sd, *tmp;
@@ -3156,3 +3156,4 @@  uint8_t *ff_stream_new_side_data(AVStream *st, enum AVPacketSideDataType type,
     sd->size = size;
     return data;
 }
+