generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
305e4b35ea
ffmpeg/tests/ref/lavf
History
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
..
aiff Place regression test output files in subdirs per family 2010-03-02 21:41:52 +00:00
alaw Place regression test output files in subdirs per family 2010-03-02 21:41:52 +00:00
asf avconv: rework -t handling for encoding. 2012-02-07 20:11:11 +01:00
au Place regression test output files in subdirs per family 2010-03-02 21:41:52 +00:00
avi avconv: rework -t handling for encoding. 2012-02-07 20:11:11 +01:00
bmp regtest: place image sequence outputs in separate directories 2010-03-07 19:25:58 +00:00
caf Add caf format regression test. 2011-12-11 09:45:17 +01:00
dpx Add dpx encoding regression test. 2012-02-21 14:42:30 -05:00
dv_fmt timecode: add write regressions tests. 2012-02-02 14:16:34 +01:00
ffm avconv: rework -t handling for encoding. 2012-02-07 20:11:11 +01:00
flv_fmt lavf-regression: minimal metadata test. 2011-12-12 20:51:29 +01:00
gif ffmpeg: deprecate loop_input and loop_output options 2011-07-08 19:58:19 +02:00
gxf rawenc: switch to encode2(). 2012-02-08 21:51:24 +01:00
ismv Merge remote-tracking branch 'qatar/master' 2012-02-19 01:47:10 +01:00
jpg use mpeg2 quantization bias for mjpeg. 2010-03-15 16:37:02 +00:00
mkv avconv: rework -t handling for encoding. 2012-02-07 20:11:11 +01:00
mmf Place regression test output files in subdirs per family 2010-03-02 21:41:52 +00:00
mov timecode: add write regressions tests. 2012-02-02 14:16:34 +01:00
mpg avconv: rework -t handling for encoding. 2012-02-07 20:11:11 +01:00
mulaw Place regression test output files in subdirs per family 2010-03-02 21:41:52 +00:00
mxf timecode: add write regressions tests. 2012-02-02 14:16:34 +01:00
mxf_d10 rematrix: dont use floats for int16 code. 2011-09-19 09:25:50 +02:00
nut avconv: rework -t handling for encoding. 2012-02-07 20:11:11 +01:00
ogg avconv: rework -t handling for encoding. 2012-02-07 20:11:11 +01:00
pbmpipe Place regression test output files in subdirs per family 2010-03-02 21:41:52 +00:00
pcx regtest: place image sequence outputs in separate directories 2010-03-07 19:25:58 +00:00
pgm regtest: place image sequence outputs in separate directories 2010-03-07 19:25:58 +00:00
pgmpipe Place regression test output files in subdirs per family 2010-03-02 21:41:52 +00:00
pixfmt regtests/sws: update checksums for recent changes 2011-07-11 03:54:30 +02:00
png Add gray16 and rgb48 png encoding regression tests. 2012-01-16 10:57:56 +01:00
ppm regtest: place image sequence outputs in separate directories 2010-03-07 19:25:58 +00:00
ppmpipe Place regression test output files in subdirs per family 2010-03-02 21:41:52 +00:00
rm avconv: rework -t handling for encoding. 2012-02-07 20:11:11 +01:00
rso Enable already existing rso regression test. 2012-02-21 14:42:30 -05:00
sgi regtest: place image sequence outputs in separate directories 2010-03-07 19:25:58 +00:00
sox Add regression test for "sox" format muxer/demuxer. 2012-02-21 14:42:30 -05:00
swf Place regression test output files in subdirs per family 2010-03-02 21:41:52 +00:00
tga regtest: place image sequence outputs in separate directories 2010-03-07 19:25:58 +00:00
tiff regtest: place image sequence outputs in separate directories 2010-03-07 19:25:58 +00:00
ts Modified to generate PAT/PMT for video keyframes 2012-02-11 23:57:35 +01:00
voc Place regression test output files in subdirs per family 2010-03-02 21:41:52 +00:00
voc_s16 Add regression test for stereo s16le in voc. 2011-01-19 12:51:42 +00:00
wav riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header 2011-10-14 13:28:58 +02:00
wtv lavf-regression: minimal metadata test. 2011-12-12 20:51:29 +01:00
xwd Merge remote-tracking branch 'qatar/master' 2012-02-26 05:11:21 +01:00
yuv4mpeg Place regression test output files in subdirs per family 2010-03-02 21:41:52 +00:00