diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-04 22:54:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-04 22:59:32 +0200 |
| commit | 944d049eaa1ca829d97c2877ec9524c049148e14 (patch) | |
| tree | 472292bb64fb4b786c5c2bd22835f9bdb0f227b5 /tests | |
| parent | df03ae8dd80b28e0461611709e290bc61db3cdca (diff) | |
| parent | 41e9682af22336bd08a5906629731c0c32aa00c6 (diff) | |
| download | ffmpeg-streaming-944d049eaa1ca829d97c2877ec9524c049148e14.zip ffmpeg-streaming-944d049eaa1ca829d97c2877ec9524c049148e14.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
movenc: Write chan atom for all audio tracks in mov mode movies.
mpegtsenc: use avio_open_dyn_buf(), zero pointers after freeing
doc/avconv: add some details about the transcoding process.
avidec: make scale and rate unsigned.
avconv: check output stream recording time before each frame returned from filters
avconv: split selecting input file out of transcode().
avconv: split checking for active outputs out of transcode().
avfiltergraph: make some functions static.
Conflicts:
ffmpeg.c
libavfilter/avfiltergraph.c
libavfilter/internal.h
libavformat/mpegtsenc.c
tests/ref/fate/acodec-alac
tests/ref/fate/acodec-pcm-s16be
tests/ref/fate/acodec-pcm-s24be
tests/ref/fate/acodec-pcm-s32be
tests/ref/fate/acodec-pcm-s8
tests/ref/lavf/mov
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ref/fate/acodec-alac | 4 | ||||
| -rw-r--r-- | tests/ref/fate/acodec-pcm-s16be | 4 | ||||
| -rw-r--r-- | tests/ref/fate/acodec-pcm-s24be | 4 | ||||
| -rw-r--r-- | tests/ref/fate/acodec-pcm-s32be | 4 | ||||
| -rw-r--r-- | tests/ref/fate/acodec-pcm-s8 | 4 | ||||
| -rw-r--r-- | tests/ref/lavf/mov | 16 |
6 files changed, 18 insertions, 18 deletions
diff --git a/tests/ref/fate/acodec-alac b/tests/ref/fate/acodec-alac index 6f52d8b..d923719 100644 --- a/tests/ref/fate/acodec-alac +++ b/tests/ref/fate/acodec-alac @@ -1,4 +1,4 @@ -1e5266b204b33ab4608e368d309716cb *tests/data/fate/acodec-alac.mov -388994 tests/data/fate/acodec-alac.mov +f01f453dd13c4e88266409cddf2a7177 *tests/data/fate/acodec-alac.mov +389018 tests/data/fate/acodec-alac.mov 64151e4bcc2b717aa5a8454d424d6a1f *tests/data/fate/acodec-alac.out.wav stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400 diff --git a/tests/ref/fate/acodec-pcm-s16be b/tests/ref/fate/acodec-pcm-s16be index 00285b8..1cf04ed 100644 --- a/tests/ref/fate/acodec-pcm-s16be +++ b/tests/ref/fate/acodec-pcm-s16be @@ -1,4 +1,4 @@ -a874f5c08b8d104a6bbf41b21454180d *tests/data/fate/acodec-pcm-s16be.mov -1059045 tests/data/fate/acodec-pcm-s16be.mov +8bffa66afe9e17366af11e77882518a0 *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 894844a..d0376a6 100644 --- a/tests/ref/fate/acodec-pcm-s24be +++ b/tests/ref/fate/acodec-pcm-s24be @@ -1,4 +1,4 @@ -833d4afd907139af7106a5642a9c23d3 *tests/data/fate/acodec-pcm-s24be.mov -1588245 tests/data/fate/acodec-pcm-s24be.mov +e3013cfce9b792acb9d572268012160d *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 5360fc1..656a6b2 100644 --- a/tests/ref/fate/acodec-pcm-s32be +++ b/tests/ref/fate/acodec-pcm-s32be @@ -1,4 +1,4 @@ -c02c96e37b321f2c978968e3a102c669 *tests/data/fate/acodec-pcm-s32be.mov -2117449 tests/data/fate/acodec-pcm-s32be.mov +f3ef00480e89c5c791e87b8af1cc167c *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 e7c09f4..cabf004 100644 --- a/tests/ref/fate/acodec-pcm-s8 +++ b/tests/ref/fate/acodec-pcm-s8 @@ -1,4 +1,4 @@ -111d465266385298fde83005402ac171 *tests/data/fate/acodec-pcm-s8.mov -529829 tests/data/fate/acodec-pcm-s8.mov +2c504a4e48c19ea1b0e1705893b771bf *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 diff --git a/tests/ref/lavf/mov b/tests/ref/lavf/mov index 7487ff2..b9b020c 100644 --- a/tests/ref/lavf/mov +++ b/tests/ref/lavf/mov @@ -1,12 +1,12 @@ -83754d7142a7770ac374f75b729a9319 *./tests/data/lavf/lavf.mov -367322 ./tests/data/lavf/lavf.mov +484aeef3be3eb4deef05c83bdc2dd484 *./tests/data/lavf/lavf.mov +367346 ./tests/data/lavf/lavf.mov ./tests/data/lavf/lavf.mov CRC=0x2f6a9b26 -9a0b239ff596da58debcf210dece3985 *./tests/data/lavf/lavf.mov -357821 ./tests/data/lavf/lavf.mov +305a68397e3cdb505704841fedcdc352 *./tests/data/lavf/lavf.mov +357845 ./tests/data/lavf/lavf.mov ./tests/data/lavf/lavf.mov CRC=0x2f6a9b26 -cea874222a6d40b1761d75ea11ebe681 *./tests/data/lavf/lavf.mov -367251 ./tests/data/lavf/lavf.mov +6e047bce400f2c4a840f783dee1ae030 *./tests/data/lavf/lavf.mov +367275 ./tests/data/lavf/lavf.mov ./tests/data/lavf/lavf.mov CRC=0xab307eb9 -9a0b239ff596da58debcf210dece3985 *./tests/data/lavf/lavf.mov -357821 ./tests/data/lavf/lavf.mov +305a68397e3cdb505704841fedcdc352 *./tests/data/lavf/lavf.mov +357845 ./tests/data/lavf/lavf.mov ./tests/data/lavf/lavf.mov CRC=0x2f6a9b26 |
