diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-29 13:19:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-29 13:19:50 +0200 |
| commit | 81487781e739a20deeeb5d3d232c5737e794e80f (patch) | |
| tree | 7f4d30aeb5952a74c7994cd59455e52794553680 /libavcodec/flac.c | |
| parent | 93704e09c77e991e18c8bc1f0ab7f1e03062150e (diff) | |
| parent | b3673f34149106eedc0457e2a2d4a9ef75a884d5 (diff) | |
| download | ffmpeg-81487781e739a20deeeb5d3d232c5737e794e80f.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
lavc/h264_refs: Fix compilation with -DTRACE.
Fix make checkheaders if libmfx is not available.
lavf/gif: Add an option max_gif_delay to limit the frame duration.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/flac.c')
0 files changed, 0 insertions, 0 deletions