virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
Code Issues Releases Activity

avcodec/utils: Do not merge side data for encoders

Browse Source 
With side data now being added to every MPEG*/H26* video encoder
in the form of a quality scalar, software which simply stores
the pkt->data to get an ES stream would break.
This also as a side-effect makes the code faster

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-07-21 00:46:55 +02:00
parent e5bae39f46
commit 809780ca42
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/utils.c
View File

@ -2213,8 +2213,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
if (ret < 0 || !*got_packet_ptr) if (ret < 0 || !*got_packet_ptr)
av_free_packet(avpkt); av_free_packet(avpkt);
else
av_packet_merge_side_data(avpkt);
emms_c(); emms_c();
return ret; return ret;