diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 22:38:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 22:38:55 +0100 |
| commit | db594f65ec4e4a8d85113f309f3d9c31959b48e3 (patch) | |
| tree | c097024735bb75c6a3920b2dc9d4ca1a8f965302 /libavcodec/mp3_header_decompress_bsf.c | |
| parent | 5beddbc4cf81fc29866981cdf62de76299627ed0 (diff) | |
| parent | 845017105f240ac5348aad1f8a5256b86d49db76 (diff) | |
| download | ffmpeg-db594f65ec4e4a8d85113f309f3d9c31959b48e3.tar.gz | |
Merge commit '845017105f240ac5348aad1f8a5256b86d49db76'
* commit '845017105f240ac5348aad1f8a5256b86d49db76':
lavc: remove disabled FF_API_DSP_MASK cruft
lavc: remove disabled FF_API_SUB_ID cruft
Conflicts:
libavcodec/options_table.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mp3_header_decompress_bsf.c')
0 files changed, 0 insertions, 0 deletions