diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-02-26 04:47:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-26 05:11:21 +0100 |
| commit | 305e4b35ea7b643ab3ce8a37fa8cb464e8adeb3f (patch) | |
| tree | 9e3773a72155b936e1ca66d4f089fa1b7eeeb791 /tests/ref/fate/cdxl-ham6 | |
| parent | 8e039121335f482234214bc4e0322ac72c1089ef (diff) | |
| parent | 0a9efe4c6eb48bf863e2e630b3ad907a198961c5 (diff) | |
| download | ffmpeg-305e4b35ea7b643ab3ce8a37fa8cb464e8adeb3f.tar.gz | |
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>
Diffstat (limited to 'tests/ref/fate/cdxl-ham6')
| -rw-r--r-- | tests/ref/fate/cdxl-ham6 | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/tests/ref/fate/cdxl-ham6 b/tests/ref/fate/cdxl-ham6 new file mode 100644 index 0000000000..6426d45014 --- /dev/null +++ b/tests/ref/fate/cdxl-ham6 @@ -0,0 +1,17 @@ +#tb 0: 52/525 +0, 0, 0, 1, 57600, 0x87887a7b +0, 1, 1, 1, 57600, 0x10c301d2 +0, 2, 2, 1, 57600, 0xd1a6f910 +0, 3, 3, 1, 57600, 0x20242bb9 +0, 4, 4, 1, 57600, 0xae33cb7f +0, 5, 5, 1, 57600, 0x501b82c8 +0, 6, 6, 1, 57600, 0x84199043 +0, 7, 7, 1, 57600, 0x946a6dbb +0, 8, 8, 1, 57600, 0xeacea671 +0, 9, 9, 1, 57600, 0x77b8723f +0, 10, 10, 1, 57600, 0x371cdb09 +0, 11, 11, 1, 57600, 0xa16ef5ee +0, 12, 12, 1, 57600, 0xcb6abd9e +0, 13, 13, 1, 57600, 0xb73e800f +0, 14, 14, 1, 57600, 0x368bd93e +0, 15, 15, 1, 57600, 0xcde72dc5 |