[FFmpeg-cvslog] avcodec/h264: Be more tolerant to changing pps id between slices
Michael Niedermayer
git at videolan.org
Thu Apr 9 14:04:58 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 9 13:50:07 2015 +0200| [98d0c4236c7542c87f012228d3bc88aea67bddc2] | committer: Michael Niedermayer
avcodec/h264: Be more tolerant to changing pps id between slices
Fixes Ticket4446
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=98d0c4236c7542c87f012228d3bc88aea67bddc2
---
libavcodec/h264.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index b4c4cd9..639761f 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1495,9 +1495,6 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size,
continue;
again:
- if ( (!(avctx->active_thread_type & FF_THREAD_FRAME) || nals_needed >= nal_index)
- && !h->current_slice)
- h->au_pps_id = -1;
/* Ignore per frame NAL unit type during extradata
* parsing. Decoding slices is not possible in codec init
* with frame-mt */
@@ -1546,6 +1543,10 @@ again:
case NAL_SLICE:
init_get_bits(&sl->gb, ptr, bit_length);
+ if ( nals_needed >= nal_index
+ || (!(avctx->active_thread_type & FF_THREAD_FRAME) && !context_count))
+ h->au_pps_id = -1;
+
if ((err = ff_h264_decode_slice_header(h, sl)))
break;
More information about the ffmpeg-cvslog
mailing list