diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2003-11-30 17:30:18 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-11-30 17:30:18 +0000 |
| commit | 43dc0bfd2ecb7e634255d74c13715b771e471892 (patch) | |
| tree | 7bac37d5b2966aab88cb6f803d1741e81460519d /libavcodec | |
| parent | 40a12840b83b1d4ca8080e8a8fc589d2a32edc99 (diff) | |
| download | ffmpeg-43dc0bfd2ecb7e634255d74c13715b771e471892.tar.gz | |
cleanup
Originally committed as revision 2545 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h263.c | 4 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.c | 3 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.h | 1 | ||||
| -rw-r--r-- | libavcodec/rv10.c | 3 |
4 files changed, 3 insertions, 8 deletions
diff --git a/libavcodec/h263.c b/libavcodec/h263.c index 2dbebd96a0..83f7ddf618 100644 --- a/libavcodec/h263.c +++ b/libavcodec/h263.c @@ -3938,7 +3938,7 @@ static int h263_decode_block(MpegEncContext * s, DCTELEM * block, } } else if (s->mb_intra) { /* DC coef */ - if(s->h263_rv10){ + if(s->codec_id == CODEC_ID_RV10){ if (s->rv10_version == 3 && s->pict_type == I_TYPE) { int component, diff; component = (n <= 3 ? 0 : n - 4 + 1); @@ -3999,7 +3999,7 @@ retry: run = get_bits(&s->gb, 6); level = (int8_t)get_bits(&s->gb, 8); if(level == -128){ - if (s->h263_rv10) { + if (s->codec_id == CODEC_ID_RV10) { /* XXX: should patch encoder too */ level = get_sbits(&s->gb, 12); }else{ diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 1fe94e729e..346c3c3c0b 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -796,7 +796,6 @@ int MPV_encode_init(AVCodecContext *avctx) break; case CODEC_ID_RV10: s->out_format = FMT_H263; - s->h263_rv10 = 1; avctx->delay=0; s->low_delay=1; break; @@ -3782,7 +3781,7 @@ static void encode_picture(MpegEncContext *s, int picture_number) msmpeg4_encode_picture_header(s, picture_number); else if (s->h263_pred) mpeg4_encode_picture_header(s, picture_number); - else if (s->h263_rv10) + else if (s->codec_id == CODEC_ID_RV10) rv10_encode_picture_header(s, picture_number); else if (s->codec_id == CODEC_ID_FLV1) ff_flv_encode_picture_header(s, picture_number); diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index e80e3b73a5..c269e2264d 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -266,7 +266,6 @@ typedef struct MpegEncContext { /* the following codec id fields are deprecated in favor of codec_id */ int h263_plus; ///< h263 plus headers - int h263_rv10; ///< use RV10 variation for H263 int h263_msmpeg4; ///< generate MSMPEG4 compatible stream (deprecated, use msmpeg4_version instead) int h263_intel; ///< use I263 intel h263 header int h263_flv; ///< use flv h263 header diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index ec27dc3fe0..ad0bb602f8 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -402,17 +402,14 @@ static int rv10_decode_init(AVCodecContext *avctx) case 0x10000000: s->rv10_version= 0; s->h263_long_vectors=0; - s->h263_rv10 = 1; break; case 0x10003000: s->rv10_version= 3; s->h263_long_vectors=1; - s->h263_rv10 = 1; break; case 0x10003001: s->rv10_version= 3; s->h263_long_vectors=0; - s->h263_rv10 = 1; break; case 0x20001000: case 0x20100001: //ok |