diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2013-04-18 17:19:37 +0200 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2013-04-19 02:10:12 +0200 |
| commit | 7b80b3cef0a23bf47629098024c2e17c2ab6832b (patch) | |
| tree | fde9e4d06040c205dffc9fe1e8d3e2aa23737796 /libavcodec | |
| parent | 3d786591b814baef324eab3a7fc8ba9d257d67ed (diff) | |
| download | ffmpeg-7b80b3cef0a23bf47629098024c2e17c2ab6832b.tar.gz | |
lavc/utils: merge side data after video encode.
This allows encoders to communicate side data to the muxers.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/utils.c | 2 |
1 files changed, 2 insertions, 0 deletions
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; |