diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-21 00:46:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-21 00:54:59 +0200 |
| commit | 809780ca425afbb1892cbd6957ca2f1cd7d64396 (patch) | |
| tree | 41f7afc7583bafc4c797b91e120b4e86f4c46045 /libavcodec | |
| parent | e5bae39f46e55843c025d280ed5441e358e59f2e (diff) | |
| download | ffmpeg-809780ca425afbb1892cbd6957ca2f1cd7d64396.tar.gz | |
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>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/utils.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 3aa861abfb..0456bd9a50 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -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; |