[SCM] libav/experimental: patch for flv deblocking by (Garrick Meeker <gmeeker at theoryllc dot com>)

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit f5ea4461cedcfa00a6493b110963f5d5466be0c7
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Tue Jul 29 09:58:47 2003 +0000

    patch for flv deblocking by (Garrick Meeker <gmeeker at theoryllc dot com>)
    
    Originally committed as revision 2095 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h263.c b/libavcodec/h263.c
index 67321cf..9d1f599 100644
--- a/libavcodec/h263.c
+++ b/libavcodec/h263.c
@@ -51,8 +51,6 @@
 #ifdef CONFIG_ENCODERS
 static void h263_encode_block(MpegEncContext * s, DCTELEM * block,
                               int n);
-static void h263_flv_encode_block(MpegEncContext * s, DCTELEM * block,
-                                  int n);
 static void h263_encode_motion(MpegEncContext * s, int val, int fcode);
 static void h263p_encode_umotion(MpegEncContext * s, int val);
 static inline void mpeg4_encode_block(MpegEncContext * s, DCTELEM * block,
@@ -185,7 +183,7 @@ void ff_flv_encode_picture_header(MpegEncContext * s, int picture_number)
         put_bits(&s->pb, 16, s->height);
       }
       put_bits(&s->pb, 2, s->pict_type == P_TYPE); /* PictureType */
-      put_bits(&s->pb, 1, 0); /* DeblockingFlag: off */
+      put_bits(&s->pb, 1, 1); /* DeblockingFlag: on */
       put_bits(&s->pb, 5, s->qscale); /* Quantizer */
       put_bits(&s->pb, 1, 0); /* ExtraInformation */
 
diff --git a/tests/ffmpeg.regression.ref b/tests/ffmpeg.regression.ref
index b5a7705..de33c3a 100644
--- a/tests/ffmpeg.regression.ref
+++ b/tests/ffmpeg.regression.ref
@@ -47,7 +47,7 @@ stddev: 13.42 bytes:7602176
 89ad858355f9b0a92d024c5ba6e369dd *./data/a-asv1.avi
 b3e1696d73071c8f7f0ff4e10c1677ca *./data/out.yuv
 stddev: 19.19 bytes:7602176
-4a516d78139d521847fdba64a1123aea *./data/a-flv.flv
+37a528aa9efc28c5c3cc8191da90e012 *./data/a-flv.flv
 57ea0821ec4377e96647adc22717a4ba *./data/out.yuv
 stddev:  8.19 bytes:7602176
 21f8ff9f1daacd9133683bb4ea0f50a4 *./data/a-mp2.mp2
diff --git a/tests/libav.regression.ref b/tests/libav.regression.ref
index 20035b9..a87a5fc 100644
--- a/tests/libav.regression.ref
+++ b/tests/libav.regression.ref
@@ -10,7 +10,7 @@ f34176ef4f8577c93d51d7c403c8776d *./data/b-libav.asf
 ./data/b-libav.swf CRC=d813a4a6
 3d0ea8f9cc0f9c4ed096381de3ab7d53 *./data/b-libav.ffm
 ./data/b-libav.ffm CRC=2a4bfa20
-b2c9ee08b47bc840e29f2e9fdffe9825 *./data/b-libav.flv
+964bf9fc730fa66e449b6670b705a56f *./data/b-libav.flv
 ./data/b-libav.flv CRC=e2e5bc81
 9a9da315747599f7718cc9a9a09c21ff *./data/b-libav.pbm
 ./data/b-libav.pbm CRC=a1057fd1
diff --git a/tests/rotozoom.regression.ref b/tests/rotozoom.regression.ref
index 7a3d4b6..af1ab41 100644
--- a/tests/rotozoom.regression.ref
+++ b/tests/rotozoom.regression.ref
@@ -47,7 +47,7 @@ stddev: 13.18 bytes:7602176
 9c4f5a4613a5595c90c6b99bf143b6a9 *./data/a-asv1.avi
 4251d7f496bbf362251b065e840a1b73 *./data/out.yuv
 stddev:  9.80 bytes:7602176
-c91bf4595136dfea764db37edfe5173b *./data/a-flv.flv
+bee27a404ab6a1b7ab1d3551eb4f1877 *./data/a-flv.flv
 86da6ee46d2df190b4a0d72523b14a25 *./data/out.yuv
 stddev:  5.29 bytes:7602176
 21f8ff9f1daacd9133683bb4ea0f50a4 *./data/a-mp2.mp2

-- 
Libav/FFmpeg packaging