ffmpeg/libswscale/x86
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
..
rgb2rgb.c Merge remote-tracking branch 'qatar/master' 2011-06-16 03:53:58 +02:00
rgb2rgb_template.c Merge remote-tracking branch 'qatar/master' into master 2011-05-29 03:34:35 +02:00
swscale_mmx.c Merge remote-tracking branch 'qatar/master' 2011-06-16 03:53:58 +02:00
swscale_template.c Merge remote-tracking branch 'qatar/master' 2011-08-18 10:56:08 +02:00
yuv2rgb_mmx.c Merge remote-tracking branch 'qatar/master' 2011-06-16 03:53:58 +02:00
yuv2rgb_template.c In libswscale, use all lines when converting from 422p to rgb with mmx, improve quality. 2011-06-03 03:46:13 +02:00