diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-06 13:41:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-06 13:42:41 +0100 |
| commit | b6a99563962c27380e14c6f725cc8f6ae9ee5d22 (patch) | |
| tree | 87331cbe19780965be15699b3ee7c4051e60bd83 /libavcodec/gif.h | |
| parent | a51eb6d34ceda7cc4f46fc3f9d0e9b57eba61cb6 (diff) | |
| parent | 7784f47762d59e859b4d0f74b3e021ad9368ee2c (diff) | |
| download | ffmpeg-b6a99563962c27380e14c6f725cc8f6ae9ee5d22.tar.gz | |
Merge commit '7784f47762d59e859b4d0f74b3e021ad9368ee2c'
* commit '7784f47762d59e859b4d0f74b3e021ad9368ee2c':
lavf: stop using avpriv_flac_parse_streaminfo()
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/gif.h')
0 files changed, 0 insertions, 0 deletions