summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-12-16 18:52:56 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-12-16 18:52:56 +0100
commit902c0904139b532ae25113fb6e34fa4c5cdf7ebc (patch)
treef39721c994f31b92943ef69154f5da9780c20cbb /libavcodec
parentf890cb948c932e3b01f9a616ff1600769c539853 (diff)
h264: reset nal_unit_type so that decoding frames without any nal units
dont leave its value at something random. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/h264.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 6d88f61ffa..26f3a6385e 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -3777,6 +3777,8 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size){
int nals_needed=0; ///< number of NALs that need decoding before the next frame thread starts
int nal_index;
+ h->nal_unit_type= 0;
+
h->max_contexts = (HAVE_THREADS && (s->avctx->active_thread_type&FF_THREAD_SLICE)) ? avctx->thread_count : 1;
if(!(s->flags2 & CODEC_FLAG2_CHUNKS)){
h->current_slice = 0;