[FFmpeg-cvslog] avformat: expose av_stream_new_side_data helper

[John Stebbins]

ffmpeg | branch: master | John Stebbins <stebbins at jetheaddev.com> | Thu Nov  5 09:49:02 2015 -0800| [7f4ec4364bc4a73036660c1c6a3c4801db524e9e] | committer: Anton Khirnov

avformat: expose av_stream_new_side_data helper

Signed-off-by: Anton Khirnov <anton at khirnov.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7f4ec4364bc4a73036660c1c6a3c4801db524e9e
---

 doc/APIchanges           |    4 ++++
 libavformat/avformat.h   |   10 ++++++++++
 libavformat/internal.h   |    7 -------
 libavformat/mov.c        |    4 ++--
 libavformat/replaygain.c |    2 +-
 libavformat/utils.c      |    2 +-
 libavformat/version.h    |    2 +-
 7 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/doc/APIchanges b/doc/APIchanges
index 206796e..1ec6fbc 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -12,6 +12,10 @@ libavutil:     2015-08-28
 
 
 API changes, most recent first:
+
+2015-11-xx - xxxxxxx - lavf 57.1.0 - avformat.h
+  Add av_stream_new_side_data().
+
 2015-11-xx - xxxxxxx - lavu 55.3.0 - xtea.h
     Add av_xtea_le_init and av_xtea_le_crypt
 
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 57fcbf5..cd53420 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1344,6 +1344,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 7bbf775..17c45f6 100644
--- a/libavformat/internal.h
+++ b/libavformat/internal.h
@@ -419,11 +419,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 c749577..aaf1c2d 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -684,7 +684,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);
@@ -716,7 +716,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 bb17b4a..18499af 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3140,7 +3140,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;
diff --git a/libavformat/version.h b/libavformat/version.h
index d004a55..ce367dc 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -30,7 +30,7 @@
 #include "libavutil/version.h"
 
 #define LIBAVFORMAT_VERSION_MAJOR 57
-#define LIBAVFORMAT_VERSION_MINOR  0
+#define LIBAVFORMAT_VERSION_MINOR  1
 #define LIBAVFORMAT_VERSION_MICRO  0
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \