diff mbox

[FFmpeg-devel] h264: revert 1189af429211ac650aac730368a6cf5b23756605.

Message ID 20170327144903.GP4714@nb4
State Not Applicable
Headers show

Commit Message

Michael Niedermayer March 27, 2017, 2:49 p.m. UTC 
On Mon, Mar 27, 2017 at 09:39:32AM -0400, Ronald S. Bultje wrote:
> The patch introduces race conditions.
> ---
>  libavcodec/h264_slice.c |  3 ---
>  libavcodec/h264dec.c    | 20 --------------------
>  libavcodec/h264dec.h    |  8 --------
>  3 files changed, 31 deletions(-)

This seems to break "make fate"

Test h264-reinit-small_422_9-to-small_420_9 failed. Look at tests/data/fate/h264-reinit-small_422_9-to-small_420_9.err for details.
make: *** [fate-h264-reinit-small_422_9-to-small_420_9] Error 1

[...]

Comments

Ronald S. Bultje March 27, 2017, 3:04 p.m. UTC | #1 
Hi,

On Mon, Mar 27, 2017 at 10:49 AM, Michael Niedermayer <
michael@niedermayer.cc> wrote:

> On Mon, Mar 27, 2017 at 09:39:32AM -0400, Ronald S. Bultje wrote:
> > The patch introduces race conditions.
> > ---
> >  libavcodec/h264_slice.c |  3 ---
> >  libavcodec/h264dec.c    | 20 --------------------
> >  libavcodec/h264dec.h    |  8 --------
> >  3 files changed, 31 deletions(-)
>
> This seems to break "make fate"


Fixed in new version (my bad, sorry).

Ronald
diff mbox

Patch

--- ./tests/ref/fate/h264-reinit-small_422_9-to-small_420_9     2017-03-20 19:25:54.149895387 +0100
+++ tests/data/fate/h264-reinit-small_422_9-to-small_420_9      2017-03-27 16:47:09.426559237 +0200
@@ -54,28 +54,28 @@ 
 0,         48,         48,        1,   608256, 0x84b4b1f1
 0,         49,         49,        1,   608256, 0xf0d4949b
 0,         50,         50,        1,   608256, 0xee06377f
-0,         51,         51,        1,   608256, 0x9c22c5ee
-0,         52,         52,        1,   608256, 0x322abee2
-0,         53,         53,        1,   608256, 0x82745ed3
-0,         54,         54,        1,   608256, 0xe7b9248b
-0,         55,         55,        1,   608256, 0xc8c1ce0e
-0,         56,         56,        1,   608256, 0x8451eba9
-0,         57,         57,        1,   608256, 0xece9412d
-0,         58,         58,        1,   608256, 0xffbc2c24
-0,         59,         59,        1,   608256, 0xf58c117e
-0,         60,         60,        1,   608256, 0x7853f334
-0,         61,         61,        1,   608256, 0x1acd6465
-0,         62,         62,        1,   608256, 0xb668856c
-0,         63,         63,        1,   608256, 0x3f52c230
-0,         64,         64,        1,   608256, 0xd7e8b5b6
-0,         65,         65,        1,   608256, 0xf663681d
-0,         66,         66,        1,   608256, 0x07ef670c
-0,         67,         67,        1,   608256, 0x1d5084f4
-0,         68,         68,        1,   608256, 0x0ea3fe04
-0,         69,         69,        1,   608256, 0xf095d1e0
-0,         70,         70,        1,   608256, 0xbdac37fb
-0,         71,         71,        1,   608256, 0x2cbfdf91
-0,         72,         72,        1,   608256, 0x8da7190f
+0,         51,         51,        1,   608256, 0x18b81c3c
+0,         52,         52,        1,   608256, 0x1a217e1b
+0,         53,         53,        1,   608256, 0x7caf4a52
+0,         54,         54,        1,   608256, 0x9a15c16d
+0,         55,         55,        1,   608256, 0xd95ad1d4
+0,         56,         56,        1,   608256, 0xe89b7ae1
+0,         57,         57,        1,   608256, 0x724e06a5
+0,         58,         58,        1,   608256, 0xa0ae5785
+0,         59,         59,        1,   608256, 0xe8710309
+0,         60,         60,        1,   608256, 0x182d3b2f
+0,         61,         61,        1,   608256, 0x087b2a54
+0,         62,         62,        1,   608256, 0x8669afba
+0,         63,         63,        1,   608256, 0x3aedae4c
+0,         64,         64,        1,   608256, 0x8af01aeb
+0,         65,         65,        1,   608256, 0xc0711005
+0,         66,         66,        1,   608256, 0x10ddce7a
+0,         67,         67,        1,   608256, 0x7f42afc7
+0,         68,         68,        1,   608256, 0xb8d34b42
+0,         69,         69,        1,   608256, 0x663f7b32
+0,         70,         70,        1,   608256, 0x9607cdc7
+0,         71,         71,        1,   608256, 0x346e7aa9
+0,         72,         72,        1,   608256, 0x7ffdd25f
 0,         73,         73,        1,   608256, 0x08bf6fc9
 0,         74,         74,        1,   608256, 0xa2368e5c
 0,         75,         75,        1,   608256, 0x36d38f81