[FFmpeg-cvslog] h264: Support SMV2

Michael Niedermayer git at videolan.org
Sun Nov 11 02:57:53 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Nov 11 02:48:06 2012 +0100| [991f6bf93dc8de6e98e96e3da7b3b3c213e09b5c] | committer: Michael Niedermayer

h264: Support SMV2

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

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

 libavcodec/h264_ps.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c
index 2cf8365..5ba0744 100644
--- a/libavcodec/h264_ps.c
+++ b/libavcodec/h264_ps.c
@@ -429,6 +429,8 @@ int ff_h264_decode_seq_parameter_set(H264Context *h){
     }
 
     sps->ref_frame_count= get_ue_golomb_31(&s->gb);
+    if (h->s.avctx->codec_tag == MKTAG('S', 'M', 'V', '2'))
+        sps->ref_frame_count= 2;
     if(sps->ref_frame_count > MAX_PICTURE_COUNT-2 || sps->ref_frame_count > 16U){
         av_log(h->s.avctx, AV_LOG_ERROR, "too many reference frames\n");
         goto fail;



More information about the ffmpeg-cvslog mailing list