diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-02 00:51:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-02 00:51:11 +0100 |
| commit | 7b0b10ce4186eaa1cd3c0a2bfbb86307d65eecfd (patch) | |
| tree | a9a937af698ca14ef06ec2c07453f474aa5ca3c7 /tests/ref/acodec/pcm_s24be | |
| parent | 8b08f81949bcfa6fec42ff3f1c9bef5be8140300 (diff) | |
| parent | 04403ec2e405a3cfcfbdd45f1274be30c652e462 (diff) | |
| download | ffmpeg-7b0b10ce4186eaa1cd3c0a2bfbb86307d65eecfd.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (25 commits)
rtpenc: Add support for G726 audio
rtpdec: Interpret the different G726 names as bits_per_coded_sample
rtpenc: Change rtp_send_samples to handle sample sizes other than even bytes
rtpenc: Cast a rescaling parameter to int64_t
h264: cap max has_b_frames at MAX_DELAYED_PIC_COUNT - 1.
ARM: fix indentation in ff_dsputil_init_neon()
ARM: NEON put/avg_pixels8/16 cosmetics
ARM: add remaining NEON avg_pixels8/16 functions
ARM: clean up NEON put/avg_pixels macros
fate: split acodec-pcm into individual tests
swscale: #include "libavutil/mathematics.h"
pmpdec: don't use deprecated av_set_pts_info.
rv34: align temporary block of "dct" coefs
Add PlayStation Portable PMP format demuxer
proto: Realign struct initializers
proto: Use .priv_data_size to allocate the private context
mmsh: Properly clean up if the second ffurl_alloc failed
rtmp: Clean up properly if the handshake failed
md5proto: Remove the get_file_handle function
applehttpproto: Use the close function if the open function fails
...
Conflicts:
libavcodec/vble.c
libavformat/mmsh.c
libavformat/pmpdec.c
libavformat/udp.c
tests/ref/acodec/pcm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/acodec/pcm_s24be')
| -rw-r--r-- | tests/ref/acodec/pcm_s24be | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/ref/acodec/pcm_s24be b/tests/ref/acodec/pcm_s24be new file mode 100644 index 0000000000..743183e337 --- /dev/null +++ b/tests/ref/acodec/pcm_s24be @@ -0,0 +1,4 @@ +22c5c3df0a4765e28c205a4fb95b3cdc *./tests/data/acodec/pcm_s24be.mov +1588193 ./tests/data/acodec/pcm_s24be.mov +64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm_s24be.acodec.out.wav +stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400 |