diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-28 12:33:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-28 12:33:49 +0200 |
| commit | 40beec6a431d5590aa42e5e5e3c10fe9a16fc9ed (patch) | |
| tree | ca643d04291fcbfc5e857007a86a03463462f836 /libavcodec/jpeglsdec.c | |
| parent | 61301ca7860fb044995c71a0cd432cb3d833eb3b (diff) | |
| parent | 5fdaf312c5541b77b6364db8b49d6abb416a25c0 (diff) | |
| download | ffmpeg-40beec6a431d5590aa42e5e5e3c10fe9a16fc9ed.tar.gz | |
Merge commit '5fdaf312c5541b77b6364db8b49d6abb416a25c0'
* commit '5fdaf312c5541b77b6364db8b49d6abb416a25c0':
flac: make avpriv_flac_parse_block_header() inline
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpeglsdec.c')
0 files changed, 0 insertions, 0 deletions