diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-16 17:10:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-16 17:10:51 +0200 |
| commit | c607a2cc97808c3213bd3b73aa076d81f5470a60 (patch) | |
| tree | 901fda1539f4e7462e147c7b76debb8bf29654bc /tools | |
| parent | af00d68af0f0bb18be0979a274e6e666360130f5 (diff) | |
| parent | 4dbceaa3a84c577e9d79f8c440ee7c223ac917d6 (diff) | |
| download | ffmpeg-c607a2cc97808c3213bd3b73aa076d81f5470a60.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
sparc: Eliminate dead code in VIS acceleration macros
flacdec: drop unnecessary assert
mjpegdec: properly report unsupported disabled features
Conflicts:
libavcodec/flacdec.c
libavcodec/mjpegdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions