diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2015-11-16 16:18:42 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2015-11-16 16:19:27 +0000 |
| commit | 61344c04ca89a3eeea473dd0855a47f770a3c67b (patch) | |
| tree | 2fe93130c0b3fe14b48446e0627ec0b84cdef0ee /tests | |
| parent | 8adff79b6d30d1ae2cb9cf906e1d7fcd759cd638 (diff) | |
| parent | 59e8ec0aa8ab174701d01a3bfe96fedd0b7fcead (diff) | |
| download | ffmpeg-61344c04ca89a3eeea473dd0855a47f770a3c67b.tar.gz | |
Merge commit '59e8ec0aa8ab174701d01a3bfe96fedd0b7fcead'
All diferences in unit tests have been acounted for.
* commit '59e8ec0aa8ab174701d01a3bfe96fedd0b7fcead':
movenc: Add an API unit test for fragmenting options/calls
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/libavformat.mak | 4 | ||||
| -rw-r--r-- | tests/ref/fate/movenc | 20 | ||||
| -rw-r--r-- | tests/ref/fate/source | 1 |
3 files changed, 25 insertions, 0 deletions
diff --git a/tests/fate/libavformat.mak b/tests/fate/libavformat.mak index 4102ce891d..1d6aa863b6 100644 --- a/tests/fate/libavformat.mak +++ b/tests/fate/libavformat.mak @@ -18,5 +18,9 @@ FATE_LIBAVFORMAT-yes += fate-url fate-url: libavformat/url-test$(EXESUF) fate-url: CMD = run libavformat/url-test +FATE_LIBAVFORMAT-$(CONFIG_MOV_MUXER) += fate-movenc +fate-movenc: libavformat/movenc-test$(EXESUF) +fate-movenc: CMD = run libavformat/movenc-test + FATE-$(CONFIG_AVFORMAT) += $(FATE_LIBAVFORMAT-yes) fate-libavformat: $(FATE_LIBAVFORMAT) diff --git a/tests/ref/fate/movenc b/tests/ref/fate/movenc new file mode 100644 index 0000000000..e2fd059f5d --- /dev/null +++ b/tests/ref/fate/movenc @@ -0,0 +1,20 @@ +167647a7019bb1f134329b22bd4ddcdf 2681 non-empty-moov +8a7595021c11a848ac20ec4f77c9d0bf 3113 non-empty-moov-elst +f9d6b8fce9404a8d2a947badcf65fba6 3049 non-empty-moov-no-elst +d43b8a181c074d94f152e6f03f83abb2 9115 ismv +204d141d70e4801333ab516bb9e1d3fc 2303 empty-moov +5af446fd5e0a7978e8dff9511938ddab 2703 empty-moov-no-elst +ad43cfb415822a0d70db0f11a87ced66 2535 empty-moov-no-elst-no-adjust +204d141d70e4801333ab516bb9e1d3fc 2303 delay-moov +0cf964a5e0908cfb3a023d5c48776ac6 2607 delay-moov-elst +9a6a892af043f1d77b2f5ee6deaadcd7 1858 delay-moov-empty-track +7453fb089ad8799669259cbf559bdb37 1761 delay-moov-empty-track-flush +39d798aa11a265c7906f9e11d4f303c0 1159 empty-moov-header +473d94ed152c332015f7e1d327fa855d 996 empty-moov-content +39d798aa11a265c7906f9e11d4f303c0 1159 delay-moov-header +473d94ed152c332015f7e1d327fa855d 996 delay-moov-content +64e38d416e9344c8046e37426cdf2807 584 empty-moov-second-frag +64e38d416e9344c8046e37426cdf2807 584 empty-moov-second-frag-discont +64e38d416e9344c8046e37426cdf2807 584 delay-moov-second-frag-discont +da0d89d03fa601b40f6a653c8314e333 3615 vfr +da0d89d03fa601b40f6a653c8314e333 3615 vfr-noduration diff --git a/tests/ref/fate/source b/tests/ref/fate/source index 450e064e2e..00bfc98391 100644 --- a/tests/ref/fate/source +++ b/tests/ref/fate/source @@ -12,6 +12,7 @@ libavfilter/log2_tab.c libavformat/file_open.c libavformat/golomb_tab.c libavformat/log2_tab.c +libavformat/movenc-test.c libavutil/x86_cpu.h libswresample/log2_tab.c libswscale/log2_tab.c |