From 809780ca425afbb1892cbd6957ca2f1cd7d64396 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 21 Jul 2015 00:46:55 +0200 Subject: 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 --- libavcodec/utils.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'libavcodec') 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; -- cgit v1.2.3