ffmpeg/tests/ref
Michael Niedermayer eadd4264ee Merge remote-tracking branch 'qatar/master'
* qatar/master: (36 commits)
  adpcmenc: Use correct frame_size for Yamaha ADPCM.
  avcodec: add ff_samples_to_time_base() convenience function to internal.h
  adx parser: set duration
  mlp parser: set duration instead of frame_size
  gsm parser: set duration
  mpegaudio parser: set duration instead of frame_size
  (e)ac3 parser: set duration instead of frame_size
  flac parser: set duration instead of frame_size
  avcodec: add duration field to AVCodecParserContext
  avutil: add av_rescale_q_rnd() to allow different rounding
  pnmdec: remove useless .pix_fmts
  libmp3lame: support float and s32 sample formats
  libmp3lame: renaming, rearrangement, alignment, and comments
  libmp3lame: use the LAME default bit rate
  libmp3lame: use avpriv_mpegaudio_decode_header() for output frame parsing
  libmp3lame: cosmetics: remove some pointless comments
  libmp3lame: convert some debugging code to av_dlog()
  libmp3lame: remove outdated comment.
  libmp3lame: do not set coded_frame->key_frame.
  libmp3lame: improve error handling in MP3lame_encode_init()
  ...

Conflicts:
	doc/APIchanges
	libavcodec/libmp3lame.c
	libavcodec/pcxenc.c
	libavcodec/pnmdec.c
	libavcodec/pnmenc.c
	libavcodec/sgienc.c
	libavcodec/utils.c
	libavformat/hls.c
	libavutil/avutil.h
	libswscale/x86/swscale_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-21 05:10:12 +01:00
..
acodec Merge remote-tracking branch 'qatar/master' 2012-02-21 05:10:12 +01:00
fate Merge remote-tracking branch 'qatar/master' 2012-02-17 00:35:06 +01:00
lavf Merge remote-tracking branch 'qatar/master' 2012-02-19 01:47:10 +01:00
lavf-fate lavf-fate-ogg_vp3: Try -idct auto instead of -idct simple. 2012-02-18 21:45:07 +01:00
lavfi Fix fate tests after 5c2c6bbf. 2012-02-09 23:56:47 +01:00
seek Update mkv seek tests. 2012-02-13 21:48:20 +01:00
vsynth1 cljr: set the properties of the coded_frame, not input frame. 2012-02-12 08:05:38 +01:00
vsynth2 cljr: set the properties of the coded_frame, not input frame. 2012-02-12 08:05:38 +01:00