From 179386025eadce8a440a548b78008342de7c73a3 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 28 Feb 2003 16:06:40 +0000
Subject: [PATCH] 10l
Originally committed as revision 1615 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/h263.c | 12 ++++++++----
tests/ffmpeg.regression.ref | 2 +-
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/libavcodec/h263.c b/libavcodec/h263.c
index 98be0fe1182..9fe405a0780 100644
--- a/libavcodec/h263.c
+++ b/libavcodec/h263.c
@@ -1519,7 +1519,7 @@ static void h263_encode_block(MpegEncContext * s, DCTELEM * block, int n)
level = 1;
block[0] = 1;
}
- if (level == 128)
+ if (level == 128) //FIXME check rv10
put_bits(&s->pb, 8, 0xff);
else
put_bits(&s->pb, 8, level & 0xff);
@@ -3548,7 +3548,8 @@ static int h263_decode_block(MpegEncContext * s, DCTELEM * block,
}
} else if (s->mb_intra) {
/* DC coef */
- if (s->h263_rv10 && s->rv10_version == 3 && s->pict_type == I_TYPE) {
+ if(s->h263_rv10){
+ if (s->rv10_version == 3 && s->pict_type == I_TYPE) {
int component, diff;
component = (n <= 3 ? 0 : n - 4 + 1);
level = s->last_dc[component];
@@ -3562,10 +3563,13 @@ static int h263_decode_block(MpegEncContext * s, DCTELEM * block,
} else {
s->rv10_first_dc_coded[component] = 1;
}
- } else {
+ } else {
+ level = get_bits(&s->gb, 8);
+ }
+ }else{
level = get_bits(&s->gb, 8);
if((level&0x7F) == 0){
- fprintf("illegal dc at %d %d\n", s->mb_x, s->mb_y);
+ fprintf(stderr, "illegal dc %d at %d %d\n", level, s->mb_x, s->mb_y);
return -1;
}
if (level == 255)
diff --git a/tests/ffmpeg.regression.ref b/tests/ffmpeg.regression.ref
index feb3176b556..d1d0f06d2c7 100644
--- a/tests/ffmpeg.regression.ref
+++ b/tests/ffmpeg.regression.ref
@@ -22,7 +22,7 @@ da8e21c7b78b7a25558dc319524b91d8 *./data/out.yuv
5bcc6fd4b7dde27c74c633c761f0e5b1 *./data/a-mjpeg.avi
f23a9e50a559e174766ee808c48fea22 *./data/out.yuv
4b37703d3dc03873f99603165c0fe11e *./data/a-rv10.rm
-545df74e0aa443499600faedd10a7065 *./data/out.yuv
+255469fef47bee94cfb2e3385ebb736b *./data/out.yuv
21f8ff9f1daacd9133683bb4ea0f50a4 *./data/a-mp2.mp2
116d1290ba1b4eb98fdee52e423417b1 *./data/out.wav
048b9c3444c788bac6ce5cc3a8f4db00 *./data/a-ac3.rm
--
GitLab