Merge commit '25b32586566f285d797737863c97a1c5c9c84e2b'

* commit '25b32586566f285d797737863c97a1c5c9c84e2b':
  lavf: add an AVStream field for exporting stream-global side data

Conflicts:
	libavformat/utils.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 6 insertions, 0 deletions

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 8067567d6a..a10c39799a 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3509,9 +3509,15 @@ int av_read_pause(AVFormatContext *s)
 }
 
 void ff_free_stream(AVFormatContext *s, AVStream *st) {
+    int j;
     av_assert0(s->nb_streams>0);
     av_assert0(s->streams[ s->nb_streams - 1 ] == st);
 
+    for (j = 0; j < st->nb_side_data; j++)
+        av_freep(&st->side_data[j].data);
+    av_freep(&st->side_data);
+    st->nb_side_data = 0;
+
     if (st->parser) {
         av_parser_close(st->parser);
     }