diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-23 04:16:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-23 04:29:51 +0200 |
| commit | 01a73d6cef70dfa90fdf79f7afd55b817b4c9342 (patch) | |
| tree | 6439c123a8368d7e2830d90d7b47725c5efe5f1c /libavcodec/lcl.h | |
| parent | 0753721ed1caab048b58db15ebfdf45569e83420 (diff) | |
| parent | a121754852a69b4879a39ba78863404c13c54f61 (diff) | |
| download | ffmpeg-01a73d6cef70dfa90fdf79f7afd55b817b4c9342.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ffmpeg: Don't trigger url_interrupt_cb on the first signal
avoptions: Check the return value from av_get_number
dct32_sse: eliminate some spills
Fix dct32() compilation with --disable-yasm
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/lcl.h')
0 files changed, 0 insertions, 0 deletions