Remove disabled legacy code in ffplay.

[ffmpeg] / libavcodec / rv20enc.c

diff --git a/libavcodec/rv20enc.c b/libavcodec/rv20enc.c
index fbcbecb051a34d39fbbd5ebf11919bdf167d1e5d..fe26dd486deb50b8e652c32e3be074e6a6f1d234 100644 (file)
--- a/libavcodec/rv20enc.c
+++ b/libavcodec/rv20enc.c
@@ -21,11 +21,12 @@
  */
 
 /**
- * @file libavcodec/rv20enc.c
+ * @file
  * RV20 encoder
  */
 
 #include "mpegvideo.h"
+#include "h263.h"
 #include "put_bits.h"
 
 void rv20_encode_picture_header(MpegEncContext *s, int picture_number){
@@ -40,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);
@@ -56,9 +57,9 @@ void rv20_encode_picture_header(MpegEncContext *s, int picture_number){
     }
 }
 
-AVCodec rv20_encoder = {
+AVCodec ff_rv20_encoder = {
     "rv20",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_RV20,
     sizeof(MpegEncContext),
     MPV_encode_init,