summaryrefslogtreecommitdiffstats
path: root/libavcodec/h264dec.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-01-23 22:33:27 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2017-01-24 12:13:59 +0100
commit25f4f08ba5b4d928f8b02ca388e1aa8d37d8e24e (patch)
treec9a1b09bffd0cc8df88f8a8a778bcab9afb60d9a /libavcodec/h264dec.h
parent08e5732318a46fd1fe9a406ff829838483dc1358 (diff)
downloadffmpeg-streaming-25f4f08ba5b4d928f8b02ca388e1aa8d37d8e24e.zip
ffmpeg-streaming-25f4f08ba5b4d928f8b02ca388e1aa8d37d8e24e.tar.gz
avcodec/h264dec: Fix regression with "make fate-h264-attachment-631 THREADS=8"
This treats the case of no slices like no frames which it basically is. The field is added to the context as other nal related fields are also there and passing the has_slices field per *arguments is ugly and not consistent Found-by: ubitux Approved-by: ubitux Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/h264dec.h')
-rw-r--r--libavcodec/h264dec.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h
index c8b7e66..fa5c98e 100644
--- a/libavcodec/h264dec.h
+++ b/libavcodec/h264dec.h
@@ -446,6 +446,8 @@ typedef struct H264Context {
int nal_ref_idc;
int nal_unit_type;
+ int has_slice; ///< slice NAL is found in the packet, set by decode_nal_units, its state does not need to be preserved outside h264_decode_frame()
+
/**
* Used to parse AVC variant of H.264
*/
OpenPOWER on IntegriCloud