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
..
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
amv
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-06-30 09:47:32 +01:00
2010-03-15 19:23:24 +00:00
caf
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
crc
2011-07-03 17:17:54 +01:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
dpx
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-08-28 11:46:03 +00:00
2010-08-28 11:46:03 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-01-22 03:08:21 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-07-04 16:26:26 +01:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
md5
2011-07-03 18:19:18 +01:00
2010-03-15 19:23:24 +00:00
2010-08-31 11:13:14 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-07-17 10:50:25 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-04-19 11:51:40 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-07-11 12:44:32 +00:00
ptx
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
rl2
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-08-17 15:00:42 +02:00
sha
2010-08-31 20:07:38 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
smc
2011-01-14 22:32:26 +00:00
2010-03-15 19:23:24 +00:00
2010-12-28 23:52:53 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
tmv
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
vp3
2010-08-25 17:23:38 +00:00
vp5
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-06-24 22:13:52 +00:00
2010-04-13 14:29:13 +00:00
w64
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2011-03-22 11:07:46 +00:00
2010-03-15 19:23:24 +00:00
2010-08-28 14:51:51 +00:00
2010-03-15 19:23:24 +00:00
yop
2010-07-11 00:07:31 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00
2010-03-15 19:23:24 +00:00