ffmpeg | branch: master | Clément Bœsch <clement@stupeflix.com> | Wed Jun 29 16:13:36 2016 +0200| [a2901472fe187c346412c0a2a4b6d988f7f076c5] | committer: Clément Bœsch lavc/h264_slice: properly forward positive "error" code Fixes ./ffmpeg -skip_frame nokey -i h264/h264_intra_first-small.ts Regression since c54e2740e1f4a8fb7fa4e521755bf4158c4cda51

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a2901472fe187c3464...

libavcodec/h264_slice.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 522a36c..0c36c8f 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)