diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-06 13:17:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-06 13:17:12 +0200 |
| commit | c4a696fb546576759467358d5258268a30aaa4d3 (patch) | |
| tree | 1dbda94e03f632ad22be3fef1bcac29aeb1cb446 /libavformat/jacosubenc.c | |
| parent | 2a27e5255071e2bac7f78f484c528d0810be73a0 (diff) | |
| parent | befe044bb9561c9d7d6559db06bba375e82a4b66 (diff) | |
| download | ffmpeg-c4a696fb546576759467358d5258268a30aaa4d3.tar.gz | |
Merge commit 'befe044bb9561c9d7d6559db06bba375e82a4b66'
* commit 'befe044bb9561c9d7d6559db06bba375e82a4b66':
avcodec: Stop exporting the removed audio_resample* symbols
Conflicts:
libavcodec/libavcodec.v
Not merged as theres no pressing need to remove it now.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/jacosubenc.c')
0 files changed, 0 insertions, 0 deletions