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 /compat/msvcrt | |
parent | 1081d78746906ac18283af0087254652498e81ed (diff) | |
parent | 27c8337e595a058347150269d5c2c48281e4285b (diff) | |
download | ffmpeg-streaming-dde4832b64c53a680cdf8bf4dfb1694e2b802154.zip ffmpeg-streaming-dde4832b64c53a680cdf8bf4dfb1694e2b802154.tar.gz |
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 'compat/msvcrt')
0 files changed, 0 insertions, 0 deletions