From 7b80b3cef0a23bf47629098024c2e17c2ab6832b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <ubitux@gmail.com>
Date: Thu, 18 Apr 2013 17:19:37 +0200
Subject: [PATCH] lavc/utils: merge side data after video encode.

This allows encoders to communicate side data to the muxers.
---
 libavcodec/utils.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 208bed1d91..f47d82590a 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;