diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-11 15:24:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-11 15:24:22 +0200 |
| commit | ec7946853a24855cc4e889f788195f57ce59ccab (patch) | |
| tree | 323a8434157c2136b0ebd5e563bb0b566ac5bb8c /MAINTAINERS | |
| parent | 7b56dddd565438e5c9a9bfcd0a55e087ce0800fe (diff) | |
| parent | 55e778bebd6352977eebe406b522e2e9aed7ce35 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtpdec_jpeg: Add support for default quantizers
x86: dsputil: Move specific optimization settings out of global init function
avplay: get rid of ugly casts in the options table
avplay: fix prototypes for option callbacks.
flvdec: always set AVFMTCTX_NOHEADER.
file: Use a normal private context for storing the file descriptor
configure: Adjust the xgetbv instrinsic check
configure: Add --disable-inline-asm command line option
configure: Don't try to enable the log2 function on msvcrt
Conflicts:
configure
ffplay.c
libavcodec/x86/dsputil_mmx.c
libavformat/file.c
libavformat/flvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'MAINTAINERS')
0 files changed, 0 insertions, 0 deletions