OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dc3c375
)
avcodec/h264: Be more strict on rejecting pps_id changes
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 6 Feb 2015 14:01:17 +0000
(15:01 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 6 Feb 2015 14:22:51 +0000
(15:22 +0100)
Fixes race condition
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c
patch
|
blob
|
history
diff --git
a/libavcodec/h264.c
b/libavcodec/h264.c
index
4b01dcc
..
f8f99e2
100644
(file)
--- a/
libavcodec/h264.c
+++ b/
libavcodec/h264.c
@@
-1496,8
+1496,8
@@
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
)
+ 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