diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 13:54:17 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 13:56:52 +0200 |
commit | b222e0773c78918a59e7748b56eed0bdd8afa043 (patch) | |
tree | bdeddf2e8604da5131c52f2d70ae70e320cf5c5e /libavcodec/audio_frame_queue.c | |
parent | 35bb74900b951dccdc7481e98a00246f59ec2420 (diff) | |
parent | e121ac634ba324a318f4a97f978dcfb48da6b735 (diff) | |
download | ffmpeg-b222e0773c78918a59e7748b56eed0bdd8afa043.tar.gz |
Merge commit 'e121ac634ba324a318f4a97f978dcfb48da6b735'
* commit 'e121ac634ba324a318f4a97f978dcfb48da6b735':
indeo45: use is_indeo4 context flag instead of checking codec ID
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/audio_frame_queue.c')
0 files changed, 0 insertions, 0 deletions