1
0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-11-14 21:58:33 +03:00
Files
ffmpeg/tests/ref/fate
Michael Niedermayer 305e4b35ea Merge remote-tracking branch 'qatar/master'
* qatar/master: (34 commits)
  mlp_parser: fix the channel mask value used for the top surround channel
  vorbisenc: check all allocations for failure
  roqaudioenc: return AVERROR codes instead of -1
  roqaudioenc: set correct bit rate
  roqaudioenc: use AVCodecContext.frame_size correctly.
  roqaudioenc: remove unneeded sample_fmt check
  ra144enc: use int16_t* for input samples rather than void*
  ra144enc: set AVCodecContext.coded_frame
  ra144enc: remove unneeded sample_fmt check
  nellymoserenc: set AVCodecContext.coded_frame
  nellymoserenc: improve error checking in encode_init()
  nellymoserenc: return AVERROR codes instead of -1
  libvorbis: improve error checking in oggvorbis_encode_init()
  mpegaudioenc: return AVERROR codes instead of -1
  libfaac: improve error checking and handling in Faac_encode_init()
  avutil: add AVERROR_UNKNOWN
  check for coded_frame allocation failure in several audio encoders
  audio encoders: do not set coded_frame->key_frame.
  g722enc: check for trellis data allocation error
  libspeexenc: export encoder delay through AVCodecContext.delay
  ...

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/fraps.c
	libavcodec/kgv1dec.c
	libavcodec/libfaac.c
	libavcodec/libgsm.c
	libavcodec/libvorbis.c
	libavcodec/mlp_parser.c
	libavcodec/roqaudioenc.c
	libavcodec/vorbisenc.c
	libavutil/avutil.h
	libavutil/error.c
	libavutil/error.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-26 05:11:21 +01:00
..
…
2011-06-30 09:47:32 +01:00
…
2012-02-25 00:18:24 -05:00
2012-02-25 00:18:24 -05:00
2012-02-25 00:18:24 -05:00
2012-02-25 00:18:24 -05:00
2011-07-03 17:17:54 +01:00
…
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
…
2012-02-08 21:51:24 +01:00
2011-10-18 10:45:22 +03:00
…
2011-07-04 16:26:26 +01:00
…
2011-07-03 18:19:18 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
…
2012-02-07 20:06:57 +01:00
…
2012-02-08 21:51:24 +01:00
…
2012-02-08 21:51:24 +01:00
…
2012-02-08 21:51:24 +01:00
2010-12-28 23:52:53 +00:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
…
2012-02-08 21:51:24 +01:00
2012-01-08 17:26:24 +01:00
…
2012-01-08 18:33:59 -08:00