diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-26 16:09:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-26 16:11:02 +0100 |
| commit | a3f30f2e995c3d72664e28a43bec41c4b13ef909 (patch) | |
| tree | 9efecd7da9820914fa354d31479a04ed2c745176 /libavcodec/cllc.c | |
| parent | 59b68ee8870ad7b831321ff39638660ac59e4a18 (diff) | |
| parent | 5ae72f54532960cb9eae82a1c9e8d505106c022b (diff) | |
| download | ffmpeg-a3f30f2e995c3d72664e28a43bec41c4b13ef909.tar.gz | |
Merge commit '5ae72f54532960cb9eae82a1c9e8d505106c022b'
* commit '5ae72f54532960cb9eae82a1c9e8d505106c022b':
flashsv: check for keyframe before using differential coding
h264: enable low delay only if no delayed frames were seen
x86: fix build without inline asm
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cllc.c')
0 files changed, 0 insertions, 0 deletions