[FFmpeg-cvslog] avcodec/h264: support AV_PKT_DATA_NEW_EXTRADATA

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul 23 17:39:30 2014 +0200| [601c2388549ff395bc99383029e92c2219152af0] | committer: Michael Niedermayer

avcodec/h264: support AV_PKT_DATA_NEW_EXTRADATA

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/h264.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index f4fcef0..10905db 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1891,6 +1891,12 @@ static int h264_decode_frame(AVCodecContext *avctx, void *data,
 
         return buf_index;
     }
+    if (h->is_avc && av_packet_get_side_data(avpkt, AV_PKT_DATA_NEW_EXTRADATA, NULL)) {
+        int side_size;
+        uint8_t *side = av_packet_get_side_data(avpkt, AV_PKT_DATA_NEW_EXTRADATA, &side_size);
+        if (is_extra(side, side_size))
+            ff_h264_decode_extradata(h, side, side_size);
+    }
     if(h->is_avc && buf_size >= 9 && buf[0]==1 && buf[2]==0 && (buf[4]&0xFC)==0xFC && (buf[5]&0x1F) && buf[8]==0x67){
         if (is_extra(buf, buf_size))
             return ff_h264_decode_extradata(h, buf, buf_size);