ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-21 05:46:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

lavc/h264_slice: properly forward positive "error" code

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

Regression since c54e2740e1
This commit is contained in:
Clément Bœsch 2016-06-29 16:13:36 +02:00
parent cdecb39fca
commit a2901472fe
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h264_slice.c
View File

@ -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)