mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-29 22:00:58 +02:00
avcodec/utils: Do not merge side data for encoders
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:
parent
e5bae39f46
commit
809780ca42
@ -2213,8 +2213,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
|
||||
|
||||
if (ret < 0 || !*got_packet_ptr)
|
||||
av_free_packet(avpkt);
|
||||
else
|
||||
av_packet_merge_side_data(avpkt);
|
||||
|
||||
emms_c();
|
||||
return ret;
|
||||
|
Loading…
x
Reference in New Issue
Block a user