diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2003-07-15 20:22:22 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-07-15 20:22:22 +0000 |
| commit | e11530e780e6a6dbd33b8b83f1ba6dfc6d68bbd0 (patch) | |
| tree | 8051698bcea03849cb38a21a738f179d7e730b0d | |
| parent | e5526b2c3963498e0d8dc06403b59b31b3104095 (diff) | |
| download | ffmpeg-e11530e780e6a6dbd33b8b83f1ba6dfc6d68bbd0.tar.gz | |
flv1 fix
Originally committed as revision 2047 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/h263.c | 7 | ||||
| -rw-r--r-- | tests/ffmpeg.regression.ref | 4 | ||||
| -rw-r--r-- | tests/libav.regression.ref | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/libavcodec/h263.c b/libavcodec/h263.c index f5ae32bb8a..ba28184f4c 100644 --- a/libavcodec/h263.c +++ b/libavcodec/h263.c @@ -5174,7 +5174,7 @@ int flv_h263_decode_picture_header(MpegEncContext *s) s->h263_plus = 0; s->unrestricted_mv = 1; - s->h263_long_vectors = s->unrestricted_mv; + s->h263_long_vectors = 0; /* PEI */ while (get_bits1(&s->gb) != 0) { @@ -5182,6 +5182,11 @@ int flv_h263_decode_picture_header(MpegEncContext *s) } s->f_code = 1; + if(s->avctx->debug & FF_DEBUG_PICT_INFO){ + printf("%c esc_type:%d, qp:%d num:%d\n", + av_get_pict_type_char(s->pict_type), s->h263_flv-1, s->qscale, s->picture_number); + } + s->y_dc_scale_table= s->c_dc_scale_table= ff_mpeg1_dc_scale_table; diff --git a/tests/ffmpeg.regression.ref b/tests/ffmpeg.regression.ref index 7989737a1a..b5a7705771 100644 --- a/tests/ffmpeg.regression.ref +++ b/tests/ffmpeg.regression.ref @@ -48,8 +48,8 @@ stddev: 13.42 bytes:7602176 b3e1696d73071c8f7f0ff4e10c1677ca *./data/out.yuv stddev: 19.19 bytes:7602176 4a516d78139d521847fdba64a1123aea *./data/a-flv.flv -84300a0d7efb0ad79a035aa1a8bdd07b *./data/out.yuv -stddev: 12.83 bytes:7602176 +57ea0821ec4377e96647adc22717a4ba *./data/out.yuv +stddev: 8.19 bytes:7602176 21f8ff9f1daacd9133683bb4ea0f50a4 *./data/a-mp2.mp2 116d1290ba1b4eb98fdee52e423417b1 *./data/out.wav 048b9c3444c788bac6ce5cc3a8f4db00 *./data/a-ac3.rm diff --git a/tests/libav.regression.ref b/tests/libav.regression.ref index 364eb56cb0..f8f95cd929 100644 --- a/tests/libav.regression.ref +++ b/tests/libav.regression.ref @@ -11,7 +11,7 @@ f34176ef4f8577c93d51d7c403c8776d *./data/a-libav.asf 3d0ea8f9cc0f9c4ed096381de3ab7d53 *./data/a-libav.ffm ./data/a-libav.ffm CRC=2a4bfa20 b2c9ee08b47bc840e29f2e9fdffe9825 *./data/a-libav.flv -./data/a-libav.flv CRC=273d7a21 +./data/a-libav.flv CRC=e2e5bc81 9a9da315747599f7718cc9a9a09c21ff *./data/a-libav.pbm ./data/a-libav.pbm CRC=a1057fd1 6ea0e1faf08f6fcdb44db4a104361b57 *./data/a-libav.pgm |