Michael Niedermayer edae3dbf1d Merge remote-tracking branch 'qatar/master' ... * qatar/master: (23 commits) h264: hide reference frame errors unless requested swscale: split hScale() function pointer into h[cy]Scale(). Move clipd macros to x86util.asm. avconv: reindent. avconv: rescue poor abused start_time global. avconv: rescue poor abused recording_time global. avconv: merge two loops in output_packet(). avconv: fix broken indentation. avconv: get rid of the arbitrary MAX_FILES limit. avconv: get rid of the output_streams_for_file vs. ost_table schizophrenia avconv: add a wrapper for output AVFormatContexts and merge output_opts into it avconv: make itsscale syntax consistent with other options. avconv: factor out adding input streams. avconv: Factorize combining auto vsync with format. avconv: Factorize video resampling. avconv: Don't unnecessarily convert ipts to a double. ffmpeg: remove unsed variable nopts RV3/4 parser: remove unused variable 'off' add XMV demuxer rmdec: parse FPS in RealMedia properly ... Conflicts: avconv.c libavformat/version.h libswscale/swscale.c tests/ref/fate/lmlm4-demux Merged-by: Michael Niedermayer <michaelni@gmx.at>		2011-08-18 10:56:08 +02:00
..
bswap.h	Merge remote branch 'qatar/master'	2011-04-24 03:41:22 +02:00
cpu.c	Merge remote-tracking branch 'newdev/master'	2011-03-23 02:42:56 +01:00
intmath.h	Replace FFmpeg with Libav in licence headers	2011-03-19 13:33:20 +00:00
intreadwrite.h	Replace FFmpeg with Libav in licence headers	2011-03-19 13:33:20 +00:00
timer.h	Replace FFmpeg with Libav in licence headers	2011-03-19 13:33:20 +00:00
x86inc.asm	Move x86inc.asm to libavutil/.	2011-08-12 11:43:02 -07:00
x86util.asm	Merge remote-tracking branch 'qatar/master'	2011-08-18 10:56:08 +02:00