diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-21 00:15:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-21 01:33:53 +0100 |
| commit | 0ebd83617fe008b7e9766f659cc3d9618b2d80d2 (patch) | |
| tree | 23bc388bf6b66cf58d7a90c0d2529e53ed984561 /tests/ref/fate/adpcm-ea-maxis-xa | |
| parent | 745a33a44318ad6d6f74835a417397cdd9dda9a9 (diff) | |
| parent | c9594fe0fb6dd123fa25cb27fe5bc976ff3a9051 (diff) | |
| download | ffmpeg-0ebd83617fe008b7e9766f659cc3d9618b2d80d2.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (27 commits)
avconv: free packet in write_frame() when discarding due to frame number limit
FATE: use +/- flag option syntax for vp8 emu-edge tests
lavf: make av_interleave_packet_per_dts() private.
lavf: deprecate av_read_packet().
oggdec: output correct timestamps for Vorbis
avconv: pass input stream timestamps to audio encoders
lavc: shrink encoded audio packet size after encoding.
xa: set correct bit rate
xa: do not set bit_rate, block_align, or bits_per_coded_sample
xa: fix end-of-file handling
xa: fix timestamp calculation
bink: fix typo in FFALIGN() argument
bink: align plane width to 8 when calculating bundle sizes
doc: pass -Idoc texi2html and texi2pod
doc: texi2pod: add -I flag
movenc: Add a min_frag_duration option
rtsp: Set the default delay to 0.1 s for the RTSP/SDP/RTP demuxers
libavformat: Set the default for the max_delay option to -1
Generate manpages for AV{Format,Codec}Context AVOptions.
doc/avconv: remove entries for AVOptions.
...
Conflicts:
doc/Makefile
doc/ffmpeg.texi
doc/muxers.texi
ffmpeg.c
libavcodec/Makefile
libavcodec/options.c
libavcodec/vp8.c
libavformat/options.c
tests/fate/demux.mak
tests/ref/fate/truemotion1-15
tests/ref/fate/truemotion1-24
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate/adpcm-ea-maxis-xa')
| -rw-r--r-- | tests/ref/fate/adpcm-ea-maxis-xa | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/tests/ref/fate/adpcm-ea-maxis-xa b/tests/ref/fate/adpcm-ea-maxis-xa new file mode 100644 index 0000000000..5d6b5c07dc --- /dev/null +++ b/tests/ref/fate/adpcm-ea-maxis-xa @@ -0,0 +1,31 @@ +#tb 0: 1/22050 +0, 0, 0, 28, 112, 0x291d1be4 +0, 28, 28, 28, 112, 0xf08d33cc +0, 56, 56, 28, 112, 0x5b1521de +0, 84, 84, 28, 112, 0x57d209f6 +0, 112, 112, 28, 112, 0x00000000 +0, 140, 140, 28, 112, 0xa15e03fc +0, 168, 168, 28, 112, 0x73a80bf4 +0, 196, 196, 28, 112, 0x916e03fc +0, 224, 224, 28, 112, 0xd92603fc +0, 252, 252, 28, 112, 0x097523dc +0, 280, 280, 28, 112, 0xf7be45ba +0, 308, 308, 28, 112, 0x0fed4db2 +0, 336, 336, 28, 112, 0x9fb41be4 +0, 364, 364, 28, 112, 0x819a0ff0 +0, 392, 392, 28, 112, 0xfe7f3fc0 +0, 420, 420, 28, 112, 0x281e1de2 +0, 448, 448, 28, 112, 0xa76605fa +0, 476, 476, 28, 112, 0x00000000 +0, 504, 504, 28, 112, 0xb84705fa +0, 532, 532, 28, 112, 0xdb5c0ff0 +0, 560, 560, 28, 112, 0xbc4305fa +0, 588, 588, 28, 112, 0x7c8305fa +0, 616, 616, 28, 112, 0x54ff21de +0, 644, 644, 28, 112, 0xc6c535ca +0, 672, 672, 28, 112, 0xa4123dc2 +0, 700, 700, 28, 112, 0x196523dc +0, 728, 728, 28, 112, 0x80ef25da +0, 756, 756, 28, 112, 0xdf742bd4 +0, 784, 784, 28, 112, 0xd78a21de +0, 812, 812, 28, 112, 0x191f0df2 |