ffmpeg/tests/ref
Michael Niedermayer f095391a14 Merge remote-tracking branch 'qatar/master'
* qatar/master: (31 commits)
  cdxl demux: do not create packets with uninitialized data at EOF.
  Replace computations of remaining bits with calls to get_bits_left().
  amrnb/amrwb: Remove get_bits usage.
  cosmetics: reindent
  avformat: do not require a pixel/sample format if there is no decoder
  avformat: do not fill-in audio packet duration in compute_pkt_fields()
  lavf: Use av_get_audio_frame_duration() in get_audio_frame_size()
  dca_parser: parse the sample rate and frame durations
  libspeexdec: do not set AVCodecContext.frame_size
  libopencore-amr: do not set AVCodecContext.frame_size
  alsdec: do not set AVCodecContext.frame_size
  siff: do not set AVCodecContext.frame_size
  amr demuxer: do not set AVCodecContext.frame_size.
  aiffdec: do not set AVCodecContext.frame_size
  mov: do not set AVCodecContext.frame_size
  ape: do not set AVCodecContext.frame_size.
  rdt: remove workaround for infinite loop with aac
  avformat: do not require frame_size in avformat_find_stream_info() for CELT
  avformat: do not require frame_size in avformat_find_stream_info() for MP1/2/3
  avformat: do not require frame_size in avformat_find_stream_info() for AAC
  ...

Conflicts:
	doc/APIchanges
	libavcodec/Makefile
	libavcodec/avcodec.h
	libavcodec/h264.c
	libavcodec/h264_ps.c
	libavcodec/utils.c
	libavcodec/version.h
	libavcodec/x86/dsputil_mmx.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-06 06:03:32 +01:00
..
acodec Merge remote-tracking branch 'qatar/master' 2012-03-05 00:15:55 +01:00
fate Merge remote-tracking branch 'qatar/master' 2012-03-06 06:03:32 +01:00
lavf Merge remote-tracking branch 'qatar/master' 2012-03-05 00:15:55 +01:00
lavf-fate lavf-fate-ogg_vp3: Try -idct auto instead of -idct simple. 2012-02-18 21:45:07 +01:00
lavfi fate: disable deshake test as it isnt binary identical across archs. 2012-02-29 07:03:04 +01:00
seek Merge remote-tracking branch 'qatar/master' 2012-03-06 06:03:32 +01:00
vsynth1 Merge remote-tracking branch 'qatar/master' 2012-03-01 03:17:11 +01:00
vsynth2 Merge remote-tracking branch 'qatar/master' 2012-03-01 03:17:11 +01:00