Merge commit '10306e9c5fcc28bd9310a9b38f21540e9e1433e9'

[ffmpeg] / libavcodec / h264.c

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index a266718ead1e4307386ef2bc1a08987e7c596b56..2348d53120985429d6c6878242d8ba7f9962c3fb 100644 (file)
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1727,7 +1727,7 @@ again:
                 if (err < 0)
                     av_log(h->avctx, AV_LOG_ERROR, "decode_slice_header error\n");
                 h->ref_count[0] = h->ref_count[1] = h->list_count = 0;
-            } else if (err == 1) {
+            } else if (err == SLICE_SINGLETHREAD) {
                 /* Slice could not be decoded in parallel mode, copy down
                  * NAL unit stuff to context 0 and restart. Note that
                  * rbsp_buffer is not transferred, but since we no longer