diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 01:45:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 02:28:44 +0200 |
| commit | 153d23ee39db0304bd2a9e7b26eef9562be07eb8 (patch) | |
| tree | 1f22d63e542ae32e6f98ac3062bb6f01a271362e /libavcodec/vp6.c | |
| parent | 476692abdb3207b722c2cbbd9ea3720004aae440 (diff) | |
| parent | bc76c46943272515805d7ac48ca39f14826d1fed (diff) | |
| download | ffmpeg-153d23ee39db0304bd2a9e7b26eef9562be07eb8.tar.gz | |
Merge commit 'bc76c46943272515805d7ac48ca39f14826d1fed'
* commit 'bc76c46943272515805d7ac48ca39f14826d1fed':
aac: Wait to know the channels before allocating frame
Conflicts:
libavcodec/aacdec.c
See: 676a395ab903cac623c5d6ddd0928c789e08a59e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vp6.c')
0 files changed, 0 insertions, 0 deletions