ffmpeg | branch: master | Jerome Borsboom <jerome.borsb...@carpalis.nl> | Mon Apr 23 20:59:20 2018 +0200| [dd1e717f5b799ebf9c813647fbce9da18a91a196] | committer: Paul B Mahol
avcodec/vc1: correct ff_vc1_mbmode_intfrp According to VC-1 spec 10.7.3.4, FIELDTX shall be set to the same type as the motion vector for zero-coded blocks. Signed-off-by: Jerome Borsboom <jerome.borsb...@carpalis.nl> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dd1e717f5b799ebf9c813647fbce9da18a91a196 --- libavcodec/vc1data.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/vc1data.c b/libavcodec/vc1data.c index fc9ba6da13..0df7d4d666 100644 --- a/libavcodec/vc1data.c +++ b/libavcodec/vc1data.c @@ -61,7 +61,7 @@ const uint8_t ff_vc1_mbmode_intfrp[2][15][4] = { { MV_PMODE_INTFR_1MV , 1, 0, 1 }, { MV_PMODE_INTFR_2MV_FIELD, 0, 0, 1 }, { MV_PMODE_INTFR_2MV_FIELD, 1, 0, 1 }, - { MV_PMODE_INTFR_2MV_FIELD, 0, 0, 0 }, + { MV_PMODE_INTFR_2MV_FIELD, 1, 0, 0 }, { MV_PMODE_INTFR_INTRA , 0, 0, 0 } }, { @@ -73,13 +73,13 @@ const uint8_t ff_vc1_mbmode_intfrp[2][15][4] = { { MV_PMODE_INTFR_1MV , 1, 0, 1 }, { MV_PMODE_INTFR_2MV_FIELD, 0, 0, 1 }, { MV_PMODE_INTFR_2MV_FIELD, 1, 0, 1 }, - { MV_PMODE_INTFR_2MV_FIELD, 0, 0, 0 }, + { MV_PMODE_INTFR_2MV_FIELD, 1, 0, 0 }, { MV_PMODE_INTFR_4MV , 0, 0, 1 }, { MV_PMODE_INTFR_4MV , 1, 0, 1 }, { MV_PMODE_INTFR_4MV , 0, 0, 0 }, { MV_PMODE_INTFR_4MV_FIELD, 0, 0, 1 }, { MV_PMODE_INTFR_4MV_FIELD, 1, 0, 1 }, - { MV_PMODE_INTFR_4MV_FIELD, 0, 0, 0 }, + { MV_PMODE_INTFR_4MV_FIELD, 1, 0, 0 }, { MV_PMODE_INTFR_INTRA , 0, 0, 0 } } }; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
