diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 20:17:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 20:21:16 +0100 |
| commit | 2d37c57f3e9d58916b1247e0f335065415ce1364 (patch) | |
| tree | f5873fa404731ec2cbf3a94b0f8fa8f0a73644e9 /libavformat/cache.c | |
| parent | e48ff13ba722f2ac37681eeea1b7813292ac87fa (diff) | |
| parent | fe99c52fa99e44961a09cd1324aefd492b797fc8 (diff) | |
| download | ffmpeg-2d37c57f3e9d58916b1247e0f335065415ce1364.tar.gz | |
Merge commit 'fe99c52fa99e44961a09cd1324aefd492b797fc8'
* commit 'fe99c52fa99e44961a09cd1324aefd492b797fc8':
mp3: Properly use AVCodecContext API
Conflicts:
libavformat/mp3dec.c
See: 6ad42b3e15478284321dd285acaf189a16590854
See: b851bc20c6931c084710e69f7eec30d8c1bdb68e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/cache.c')
0 files changed, 0 insertions, 0 deletions