Commit e11530e7 authored by Michael Niedermayer's avatar Michael Niedermayer

flv1 fix

Originally committed as revision 2047 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent e5526b2c
...@@ -5174,7 +5174,7 @@ int flv_h263_decode_picture_header(MpegEncContext *s) ...@@ -5174,7 +5174,7 @@ int flv_h263_decode_picture_header(MpegEncContext *s)
s->h263_plus = 0; s->h263_plus = 0;
s->unrestricted_mv = 1; s->unrestricted_mv = 1;
s->h263_long_vectors = s->unrestricted_mv; s->h263_long_vectors = 0;
/* PEI */ /* PEI */
while (get_bits1(&s->gb) != 0) { while (get_bits1(&s->gb) != 0) {
...@@ -5182,6 +5182,11 @@ int flv_h263_decode_picture_header(MpegEncContext *s) ...@@ -5182,6 +5182,11 @@ int flv_h263_decode_picture_header(MpegEncContext *s)
} }
s->f_code = 1; 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->y_dc_scale_table=
s->c_dc_scale_table= ff_mpeg1_dc_scale_table; s->c_dc_scale_table= ff_mpeg1_dc_scale_table;
......
...@@ -48,8 +48,8 @@ stddev: 13.42 bytes:7602176 ...@@ -48,8 +48,8 @@ stddev: 13.42 bytes:7602176
b3e1696d73071c8f7f0ff4e10c1677ca *./data/out.yuv b3e1696d73071c8f7f0ff4e10c1677ca *./data/out.yuv
stddev: 19.19 bytes:7602176 stddev: 19.19 bytes:7602176
4a516d78139d521847fdba64a1123aea *./data/a-flv.flv 4a516d78139d521847fdba64a1123aea *./data/a-flv.flv
84300a0d7efb0ad79a035aa1a8bdd07b *./data/out.yuv 57ea0821ec4377e96647adc22717a4ba *./data/out.yuv
stddev: 12.83 bytes:7602176 stddev: 8.19 bytes:7602176
21f8ff9f1daacd9133683bb4ea0f50a4 *./data/a-mp2.mp2 21f8ff9f1daacd9133683bb4ea0f50a4 *./data/a-mp2.mp2
116d1290ba1b4eb98fdee52e423417b1 *./data/out.wav 116d1290ba1b4eb98fdee52e423417b1 *./data/out.wav
048b9c3444c788bac6ce5cc3a8f4db00 *./data/a-ac3.rm 048b9c3444c788bac6ce5cc3a8f4db00 *./data/a-ac3.rm
...@@ -11,7 +11,7 @@ f34176ef4f8577c93d51d7c403c8776d *./data/a-libav.asf ...@@ -11,7 +11,7 @@ f34176ef4f8577c93d51d7c403c8776d *./data/a-libav.asf
3d0ea8f9cc0f9c4ed096381de3ab7d53 *./data/a-libav.ffm 3d0ea8f9cc0f9c4ed096381de3ab7d53 *./data/a-libav.ffm
./data/a-libav.ffm CRC=2a4bfa20 ./data/a-libav.ffm CRC=2a4bfa20
b2c9ee08b47bc840e29f2e9fdffe9825 *./data/a-libav.flv b2c9ee08b47bc840e29f2e9fdffe9825 *./data/a-libav.flv
./data/a-libav.flv CRC=273d7a21 ./data/a-libav.flv CRC=e2e5bc81
9a9da315747599f7718cc9a9a09c21ff *./data/a-libav.pbm 9a9da315747599f7718cc9a9a09c21ff *./data/a-libav.pbm
./data/a-libav.pbm CRC=a1057fd1 ./data/a-libav.pbm CRC=a1057fd1
6ea0e1faf08f6fcdb44db4a104361b57 *./data/a-libav.pgm 6ea0e1faf08f6fcdb44db4a104361b57 *./data/a-libav.pgm
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment