diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 01:36:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 01:36:21 +0200 |
| commit | c218d8218d95684c5e1b4c09ed0f258457f0ae7c (patch) | |
| tree | e6595772cb2eb12b746a945a9d5a5ccd40982c87 /libavcodec/sipr16k.c | |
| parent | 0f7ca2d77893c87d3c6e008520f6b5549f410387 (diff) | |
| parent | 24e87f7f425a52b1e69661dcb2fbe0555a76f30b (diff) | |
| download | ffmpeg-c218d8218d95684c5e1b4c09ed0f258457f0ae7c.tar.gz | |
Merge commit '24e87f7f425a52b1e69661dcb2fbe0555a76f30b'
* commit '24e87f7f425a52b1e69661dcb2fbe0555a76f30b':
Remove obsolete FF_API_PROBE_MIME cruft.
Conflicts:
libavformat/avformat.h
libavformat/format.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sipr16k.c')
0 files changed, 0 insertions, 0 deletions