generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix rv20 encoding so the binary decoder can decode it.

Browse Source 
Originally committed as revision 25203 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2010-09-26 01:56:48 +00:00
parent 48f7f29f52
commit 53eb458a72
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/mpegvideo_enc.c
View File

@ -618,7 +618,7 @@ av_cold int MPV_encode_init(AVCodecContext *avctx)
s->h263_aic=1;
s->h263_plus=1;
s->loop_filter=1;
s->unrestricted_mv= s->obmc || s->loop_filter || s->umvplus;
s->unrestricted_mv= 0;
break;
case CODEC_ID_MPEG4:
s->out_format = FMT_H263;

2
libavcodec/rv20enc.c
View File

@ -41,7 +41,7 @@ void rv20_encode_picture_header(MpegEncContext *s, int picture_number){
put_bits(&s->pb, 1, s->no_rounding);
assert(s->f_code == 1);
assert(s->unrestricted_mv == 1);
assert(s->unrestricted_mv == 0);
assert(s->alt_inter_vlc == 0);
assert(s->umvplus == 0);
assert(s->modified_quant==1);

8
tests/ref/vsynth1/rv20
View File

@ -1,4 +1,4 @@
49f656b3a84bd7173ca219fae310750c *./tests/data/vsynth1/rv20.rm
627450 ./tests/data/vsynth1/rv20.rm
a94d2babdc506b95951977cb55642981 *./tests/data/rv20.vsynth1.out.yuv
stddev: 8.24 PSNR: 29.81 MAXDIFF: 108 bytes: 7603200/ 7603200
81868601e602eee5b6d80f5ece4aaa98 *./tests/data/vsynth1/rv20.rm
646016 ./tests/data/vsynth1/rv20.rm
b45fdb0201b06f7649f44050e262c54c *./tests/data/rv20.vsynth1.out.yuv
stddev: 8.26 PSNR: 29.79 MAXDIFF: 103 bytes: 7603200/ 7603200

8
tests/ref/vsynth2/rv20
View File

@ -1,4 +1,4 @@
d864475aa16d84dd99de13e65003672a *./tests/data/vsynth2/rv20.rm
132734 ./tests/data/vsynth2/rv20.rm
c66afdcc0daac2f1b4167b9811968877 *./tests/data/rv20.vsynth2.out.yuv
stddev: 5.42 PSNR: 33.45 MAXDIFF: 81 bytes: 7603200/ 7603200
96acb098850b9bf309f89e48b08fe96f *./tests/data/vsynth2/rv20.rm
153302 ./tests/data/vsynth2/rv20.rm
46f314e70d9bac2e7d82cfc230534977 *./tests/data/rv20.vsynth2.out.yuv
stddev: 5.48 PSNR: 33.35 MAXDIFF: 81 bytes: 7603200/ 7603200