idct_sse2_xvid: remove libavutil/internal.h include

[ffmpeg] / libavcodec / rv20enc.c

diff --git a/libavcodec/rv20enc.c b/libavcodec/rv20enc.c
index 7b835cce632e07aea9db21ef03a8d015ed0bdc3c..2d21818806dc8f69c91b434c090f8cbb6d53955e 100644 (file)
--- a/libavcodec/rv20enc.c
+++ b/libavcodec/rv20enc.c
@@ -40,12 +40,12 @@ void ff_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 == 0);
-    assert(s->alt_inter_vlc == 0);
-    assert(s->umvplus == 0);
-    assert(s->modified_quant==1);
-    assert(s->loop_filter==1);
+    av_assert0(s->f_code == 1);
+    av_assert0(s->unrestricted_mv == 0);
+    av_assert0(s->alt_inter_vlc == 0);
+    av_assert0(s->umvplus == 0);
+    av_assert0(s->modified_quant==1);
+    av_assert0(s->loop_filter==1);
 
     s->h263_aic= s->pict_type == AV_PICTURE_TYPE_I;
     if(s->h263_aic){
@@ -62,7 +62,7 @@ FF_MPV_GENERIC_CLASS(rv20)
 AVCodec ff_rv20_encoder = {
     .name           = "rv20",
     .type           = AVMEDIA_TYPE_VIDEO,
-    .id             = CODEC_ID_RV20,
+    .id             = AV_CODEC_ID_RV20,
     .priv_data_size = sizeof(MpegEncContext),
     .init           = ff_MPV_encode_init,
     .encode2        = ff_MPV_encode_picture,