[FFmpeg-cvslog] lavc/utils: merge side data after video encode.

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Thu Apr 18 17:19:37 2013 +0200| [7b80b3cef0a23bf47629098024c2e17c2ab6832b] | committer: Clément Bœsch

lavc/utils: merge side data after video encode.

This allows encoders to communicate side data to the muxers.

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

 libavcodec/utils.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 208bed1..f47d825 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1772,6 +1772,8 @@ int attribute_align_arg avcodec_encode_video2(AVCodecContext *avctx,
 
     if (ret < 0 || !*got_packet_ptr)
         av_free_packet(avpkt);
+    else
+        av_packet_merge_side_data(avpkt);
 
     emms_c();
     return ret;