diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-28 23:57:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-28 23:57:31 +0200 |
| commit | 4453f6b8613b0803246c1a9160c8270ec9de1237 (patch) | |
| tree | 3a641fda838ccb4130bbf5e2d1d29c8bbcc69fa4 /tests | |
| parent | 7877b50d181be1e044eb8b57f203c763297651b1 (diff) | |
| parent | b92c7ee662b618518bff366af3274784fb141dde (diff) | |
| download | ffmpeg-4453f6b8613b0803246c1a9160c8270ec9de1237.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
flv: add support for G.711
doc: git: Add checklist with test steps to perform before pushing
flvenc: K&R formatting cosmetics
movenc: Add channel layouts for PCM.
Conflicts:
libavformat/flvenc.c
tests/ref/fate/acodec-pcm-s16be
tests/ref/fate/acodec-pcm-s24be
tests/ref/fate/acodec-pcm-s32be
tests/ref/fate/acodec-pcm-s8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ref/fate/acodec-pcm-s16be | 2 | ||||
| -rw-r--r-- | tests/ref/fate/acodec-pcm-s24be | 2 | ||||
| -rw-r--r-- | tests/ref/fate/acodec-pcm-s32be | 2 | ||||
| -rw-r--r-- | tests/ref/fate/acodec-pcm-s8 | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/tests/ref/fate/acodec-pcm-s16be b/tests/ref/fate/acodec-pcm-s16be index 1cf04ed45e..6f7222a930 100644 --- a/tests/ref/fate/acodec-pcm-s16be +++ b/tests/ref/fate/acodec-pcm-s16be @@ -1,4 +1,4 @@ -8bffa66afe9e17366af11e77882518a0 *tests/data/fate/acodec-pcm-s16be.mov +d00ca427a66be2e33ca8d63bcde41316 *tests/data/fate/acodec-pcm-s16be.mov 1059069 tests/data/fate/acodec-pcm-s16be.mov 64151e4bcc2b717aa5a8454d424d6a1f *tests/data/fate/acodec-pcm-s16be.out.wav stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400 diff --git a/tests/ref/fate/acodec-pcm-s24be b/tests/ref/fate/acodec-pcm-s24be index d0376a6eaf..c89e086630 100644 --- a/tests/ref/fate/acodec-pcm-s24be +++ b/tests/ref/fate/acodec-pcm-s24be @@ -1,4 +1,4 @@ -e3013cfce9b792acb9d572268012160d *tests/data/fate/acodec-pcm-s24be.mov +5d843e1f56796aae3185016f164b16b7 *tests/data/fate/acodec-pcm-s24be.mov 1588269 tests/data/fate/acodec-pcm-s24be.mov 64151e4bcc2b717aa5a8454d424d6a1f *tests/data/fate/acodec-pcm-s24be.out.wav stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400 diff --git a/tests/ref/fate/acodec-pcm-s32be b/tests/ref/fate/acodec-pcm-s32be index 656a6b2a61..f7dbc52d47 100644 --- a/tests/ref/fate/acodec-pcm-s32be +++ b/tests/ref/fate/acodec-pcm-s32be @@ -1,4 +1,4 @@ -f3ef00480e89c5c791e87b8af1cc167c *tests/data/fate/acodec-pcm-s32be.mov +b34c66c56df1b1e75688929cf20670b9 *tests/data/fate/acodec-pcm-s32be.mov 2117473 tests/data/fate/acodec-pcm-s32be.mov 64151e4bcc2b717aa5a8454d424d6a1f *tests/data/fate/acodec-pcm-s32be.out.wav stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400 diff --git a/tests/ref/fate/acodec-pcm-s8 b/tests/ref/fate/acodec-pcm-s8 index cabf004983..247c46c5cc 100644 --- a/tests/ref/fate/acodec-pcm-s8 +++ b/tests/ref/fate/acodec-pcm-s8 @@ -1,4 +1,4 @@ -2c504a4e48c19ea1b0e1705893b771bf *tests/data/fate/acodec-pcm-s8.mov +d931dc4fffa2d3398e0f31f97e7d6c3a *tests/data/fate/acodec-pcm-s8.mov 529853 tests/data/fate/acodec-pcm-s8.mov 651d4eb8d98dfcdda96ae6c43d8f156b *tests/data/fate/acodec-pcm-s8.out.wav stddev: 147.89 PSNR: 52.93 MAXDIFF: 255 bytes: 1058400/ 1058400 |