avcodec/utils: Do not merge side data for encoders
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 20 Jul 2015 22:46:55 +0000 (00:46 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 20 Jul 2015 22:54:59 +0000 (00:54 +0200)
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>
libavcodec/utils.c

index 3aa861a..0456bd9 100644 (file)
@@ -2213,8 +2213,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
 
     if (ret < 0 || !*got_packet_ptr)
         av_free_packet(avpkt);
 
     if (ret < 0 || !*got_packet_ptr)
         av_free_packet(avpkt);
-    else
-        av_packet_merge_side_data(avpkt);
 
     emms_c();
     return ret;
 
     emms_c();
     return ret;