highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup

Browse Source 
Originally committed as revision 2545 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2003-11-30 17:30:18 +00:00
parent 40a12840b8
commit 43dc0bfd2e
4 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/h263.c
View File

@ -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{

3
libavcodec/mpegvideo.c
View File

@ -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);

1
libavcodec/mpegvideo.h
View File

@ -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

3
libavcodec/rv10.c
View File

@ -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