diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-02-21 02:49:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-21 05:10:12 +0100 |
| commit | eadd4264ee4319abf9ec2f618ff925d7529f20ed (patch) | |
| tree | 4251d4eb25af927cb290e24d1b6957d584638403 /tests/ref | |
| parent | a923b6b8f4f90d09c7c39cc8bfab7ee9d30a2843 (diff) | |
| parent | 770a5c6d025e9c8eb3f5aba9cf1d7d7938fb918a (diff) | |
| download | ffmpeg-eadd4264ee4319abf9ec2f618ff925d7529f20ed.tar.gz | |
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>
Diffstat (limited to 'tests/ref')
| -rw-r--r-- | tests/ref/acodec/adpcm_yam | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/ref/acodec/adpcm_yam b/tests/ref/acodec/adpcm_yam index 0fd702954e..f7c9f757a6 100644 --- a/tests/ref/acodec/adpcm_yam +++ b/tests/ref/acodec/adpcm_yam @@ -1,4 +1,4 @@ -006f8dc92eb4f7bab82eded314ca1124 *./tests/data/acodec/adpcm_yam.wav -266298 ./tests/data/acodec/adpcm_yam.wav -c36a9d5a1e0ad57fbe9665a31373b7c1 *./tests/data/adpcm_yam.acodec.out.wav -stddev: 1247.60 PSNR: 34.41 MAXDIFF:39895 bytes: 1064960/ 1058400 +e9c14f701d25947317db9367b9dc772d *./tests/data/acodec/adpcm_yam.wav +265274 ./tests/data/acodec/adpcm_yam.wav +1488b5974fa040a65f0d407fc0224c6a *./tests/data/adpcm_yam.acodec.out.wav +stddev: 1247.60 PSNR: 34.41 MAXDIFF:39895 bytes: 1060864/ 1058400 |