diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2005-01-01 23:02:09 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2005-01-01 23:02:09 +0000 |
| commit | 2d2651f821e3b3c3936051f2015351381f374608 (patch) | |
| tree | 9f6ff67bd87b1f97eb518a91c251d1e164702008 | |
| parent | 53f0090dcc779da3537736d7e0bab26a1ea2120a (diff) | |
| download | ffmpeg-2d2651f821e3b3c3936051f2015351381f374608.tar.gz | |
WV1F support
Originally committed as revision 3790 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/h263.c | 9 | ||||
| -rw-r--r-- | libavformat/avienc.c | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/libavcodec/h263.c b/libavcodec/h263.c index 7b7d7eb333..78802672db 100644 --- a/libavcodec/h263.c +++ b/libavcodec/h263.c @@ -4580,7 +4580,7 @@ retry: memset(block, 0, sizeof(DCTELEM)*64); goto retry; } - av_log(s->avctx, AV_LOG_ERROR, "run overflow at %dx%d\n", s->mb_x, s->mb_y); + av_log(s->avctx, AV_LOG_ERROR, "run overflow at %dx%d i:%d\n", s->mb_x, s->mb_y, s->mb_intra); return -1; } j = scan_table[i]; @@ -5923,6 +5923,13 @@ int ff_mpeg4_decode_picture_header(MpegEncContext * s, GetBitContext *gb) /* search next start code */ align_get_bits(gb); + + if(s->avctx->codec_tag == ff_get_fourcc("WV1F") && show_bits(gb, 24) == 0x575630){ + skip_bits(gb, 24); + if(get_bits(gb, 8) == 0xF0) + return decode_vop_header(s, gb); + } + startcode = 0xff; for(;;) { v = get_bits(gb, 8); diff --git a/libavformat/avienc.c b/libavformat/avienc.c index 12d2fd7019..ca7a6dcd11 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -99,6 +99,7 @@ const CodecTag codec_bmp_tags[] = { { CODEC_ID_MPEG4, MKTAG('B', 'L', 'Z', '0') }, { CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 'v') }, { CODEC_ID_MPEG4, MKTAG('U', 'M', 'P', '4') }, + { CODEC_ID_MPEG4, MKTAG('W', 'V', '1', 'F') }, { CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '3'), .invalid_asf = 1 }, /* default signature when using MSMPEG4 */ { CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', '4', '3') }, |