Fix rv20 encoding so the binary decoder can decode it.

Originally committed as revision 25203 to svn://svn.ffmpeg.org/ffmpeg/trunk

2 files changed, 2 insertions, 2 deletions

diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 8302dd3fac..ddbc1b4bfa 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -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;
diff --git a/libavcodec/rv20enc.c b/libavcodec/rv20enc.c
index 5ab0b9a039..a31a351a89 100644
--- a/libavcodec/rv20enc.c
+++ b/libavcodec/rv20enc.c
@@ -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);