diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-29 10:21:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-29 10:21:23 +0100 |
| commit | 6bf4edec27de00adac4119a7b8df04d6c0504843 (patch) | |
| tree | b7218a9908957df093a9baa51a01801070e77777 /libavformat/matroska.c | |
| parent | f1f0b01c4700ae342bb245efcc00a724fd270c14 (diff) | |
| parent | c9a13a289d0e1607387854127476813a1ee3d34b (diff) | |
| download | ffmpeg-6bf4edec27de00adac4119a7b8df04d6c0504843.tar.gz | |
Merge commit 'c9a13a289d0e1607387854127476813a1ee3d34b'
* commit 'c9a13a289d0e1607387854127476813a1ee3d34b':
lavc: remove old unused audio conversion functions.
Conflicts:
libavcodec/audioconvert.c
libavcodec/audioconvert.h
Merge only for metadata.
keeping the old API longer reduces the need for applications to be continuously
updated.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroska.c')
0 files changed, 0 insertions, 0 deletions