lavc/utils: merge side data after video encode.

This allows encoders to communicate side data to the muxers.

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 208bed1d91be4cdfdd41e842ce258bbb08aeb8dc..f47d82590a276309fcd683f3301abdeaf5a2948b 100644 (file)
--- 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;