diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-16 13:08:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-16 13:09:30 +0100 |
| commit | dde4832b64c53a680cdf8bf4dfb1694e2b802154 (patch) | |
| tree | bf10603465501511eb6587039216607edc67f697 /libavcodec | |
| parent | 1081d78746906ac18283af0087254652498e81ed (diff) | |
| parent | 27c8337e595a058347150269d5c2c48281e4285b (diff) | |
Merge commit '27c8337e595a058347150269d5c2c48281e4285b'
* commit '27c8337e595a058347150269d5c2c48281e4285b':
h264-mt: handle NAL_DPAs before calling ff_thread_finish_setup
lavr: move AudioMix struct definition to audio_mix.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 60a25a1ef7..1419f57c34 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3896,6 +3896,7 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size) case NAL_PPS: nals_needed = nal_index; break; + case NAL_DPA: case NAL_IDR_SLICE: case NAL_SLICE: init_get_bits(&hx->s.gb, ptr, bit_length); |