[FFmpeg-cvslog] avcodec/utils: Do not merge side data for encoders

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Tue Jul 21 00:46:55 2015 +0200| [809780ca425afbb1892cbd6957ca2f1cd7d64396] | committer: Michael Niedermayer

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 at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=809780ca425afbb1892cbd6957ca2f1cd7d64396
---

 libavcodec/utils.c |    2 --
 1 file changed, 2 deletions(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 3aa861a..0456bd9 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;