diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-19 20:25:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-19 20:25:58 +0200 |
| commit | d7888ff644f5965b7a54ecefea9af1469fd1d510 (patch) | |
| tree | 3628b3d5ffd3323ccc974f16c478f39d4c7b910d /libswresample/swresample.c | |
| parent | 86be9cda97d2577165127c3b7075aa6a038995ab (diff) | |
| parent | 78a3a4580c5a547af4ae8682c662ea3a4699a599 (diff) | |
| download | ffmpeg-d7888ff644f5965b7a54ecefea9af1469fd1d510.tar.gz | |
Merge commit '78a3a4580c5a547af4ae8682c662ea3a4699a599' into release/2.4
* commit '78a3a4580c5a547af4ae8682c662ea3a4699a599':
mp3: Properly use AVCodecContext API
Conflicts:
libavformat/mp3dec.c
See: 6ad42b3e15478284321dd285acaf189a16590854
See: b851bc20c6931c084710e69f7eec30d8c1bdb68e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/swresample.c')
0 files changed, 0 insertions, 0 deletions