From: Clément Bœsch <clement@stupeflix.com>
Date: Wed, 29 Jun 2016 14:13:36 +0000 (+0200)
Subject: lavc/h264_slice: properly forward positive "error" code
X-Git-Tag: android-x86-7.1-r1~4544
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a2901472fe187c346412c0a2a4b6d988f7f076c5;p=android-x86%2Fexternal-ffmpeg.git

lavc/h264_slice: properly forward positive "error" code

Fixes ./ffmpeg -skip_frame nokey -i h264/h264_intra_first-small.ts

Regression since c54e2740e1f4a8fb7fa4e521755bf4158c4cda51
---

diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 522a36cb89..0c36c8f925 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -1702,7 +1702,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl)
     int i, j, ret = 0;
 
     ret = h264_slice_header_parse(h, sl);
-    if (ret < 0)
+    if (ret) // can not be ret<0 because of SLICE_SKIPED, SLICE_SINGLETHREAD, ...
         return ret;
 
     if (sl->slice_type_nos == AV_PICTURE_TYPE_B && !sl->direct_spatial_mv_pred)