diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-02 04:18:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-02 04:18:04 +0200 |
| commit | d4b98d475f8abf9f05ebe91b3fce341aa4b902ee (patch) | |
| tree | bc452a41fbc304d19ee058da006e9760cb160d6a /tests | |
| parent | 8d8962ca3e95b1ce86ab505498e7cd3ec89fa996 (diff) | |
| parent | 1a9f9f81b1244b952126bb65bc741b04d3534f81 (diff) | |
| download | ffmpeg-d4b98d475f8abf9f05ebe91b3fce341aa4b902ee.tar.gz | |
Merge commit '1a9f9f8' into oldabi
* commit '1a9f9f8': (98 commits)
Do not drop packets with no valid ->pos set as e.g. DV-in-AVI produces.
FFMPEG: support demuxer specific options. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
AVIDEC: use_odmc demuxer specific option. (mostly an exmaple for demuxer specific options) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
LAVFAPI: demuxer specific options. (someone please add doxy) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
output_example: use avformat_alloc_output_context() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
LAVFAPI: avformat_alloc_output_context() / simplify usage of muxers. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
LAVF API: remove AVOutputFormat.set_parameters() the field is unused. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
CrystalHD: Add auto-detection of packed b-frame bug.
lavc: remove disabled avcodec_decode_video() code
Read the album_artist, grouping and lyrics metadata.
In libx264 wrapper, change wpredp to a codec specific option.
AMV: disable DR1 and don't override EMU_EDGE
lavf: inspect more frames for fps when container time base is coarse
Fix races in default av_log handler
flashsv2enc: regression test. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
vorbis: Replace sized int_fast integer types with plain int/unsigned.
Remove disabled non-optimized code variants.
bswap.h: Remove disabled code.
Remove some disabled printf debug cruft.
Replace more disabled printf() calls by av_dlog().
...
Conflicts:
libavcodec/options.c
libavcodec/qpeg.c
libavfilter/avfilter.h
libavformat/avformat.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/codec-regression.sh | 5 | ||||
| -rw-r--r-- | tests/ref/lavf/ts | 2 | ||||
| -rw-r--r-- | tests/ref/lavfi/pixdesc_be | 4 | ||||
| -rw-r--r-- | tests/ref/vsynth1/flashsv2 | 2 | ||||
| -rw-r--r-- | tests/ref/vsynth2/flashsv2 | 2 |
5 files changed, 12 insertions, 3 deletions
diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh index b705bc188d..2525e6cc1a 100755 --- a/tests/codec-regression.sh +++ b/tests/codec-regression.sh @@ -243,6 +243,11 @@ do_video_encoding flashsv.flv "" "-an -vcodec flashsv -sws_flags neighbor+full_c do_video_decoding "" "-pix_fmt yuv420p -sws_flags area+accurate_rnd+bitexact" fi +if [ -n "$do_flashsv2" ] ; then +do_video_encoding flashsv2.flv "" "-an -vcodec flashsv2 -sws_flags neighbor+full_chroma_int+accurate_rnd+bitexact -strict experimental" +#do_video_decoding "" "-pix_fmt yuv420p -sws_flags area+accurate_rnd+bitexact" +fi + if [ -n "$do_roq" ] ; then do_video_encoding roqav.roq "" "-vframes 5" do_video_decoding "" "-pix_fmt yuv420p" diff --git a/tests/ref/lavf/ts b/tests/ref/lavf/ts index e4bdb631df..efac3ad4ee 100644 --- a/tests/ref/lavf/ts +++ b/tests/ref/lavf/ts @@ -1,3 +1,3 @@ -e8d609b8a5b5854a4485718434b287f7 *./tests/data/lavf/lavf.ts +178f5094fc874112d21b4a8716121d96 *./tests/data/lavf/lavf.ts 406644 ./tests/data/lavf/lavf.ts ./tests/data/lavf/lavf.ts CRC=0x133216c1 diff --git a/tests/ref/lavfi/pixdesc_be b/tests/ref/lavfi/pixdesc_be index 799507ec73..c5e849d28d 100644 --- a/tests/ref/lavfi/pixdesc_be +++ b/tests/ref/lavfi/pixdesc_be @@ -39,6 +39,6 @@ yuv444p16le 1262a0dc57ee147967fc896d04206313 yuva420p a29884f3f3dfe1e00b961bc17bef3d47 yuvj420p 32eec78ba51857b16ce9b813a49b7189 yuvj422p 0dfa0ed434f73be51428758c69e082cb -yuvj440p 9c3a093ff64a83ac4cf0b1e65390e236 -yuvj444p ede1e5882d5c5bba48ea33cf1209d231 +yuvj440p 657501a28004e27a592757a7509f5189 +yuvj444p 98d3d054f2ec09a75eeed5d328dc75b7 yuyv422 f2569f2b5069a0ee0cecae33de0455e3 diff --git a/tests/ref/vsynth1/flashsv2 b/tests/ref/vsynth1/flashsv2 new file mode 100644 index 0000000000..0df3f47c18 --- /dev/null +++ b/tests/ref/vsynth1/flashsv2 @@ -0,0 +1,2 @@ +ec13d68cbce263f589fe79bcd2e98364 *./tests/data/vsynth1/flashsv2.flv +8406137 ./tests/data/vsynth1/flashsv2.flv diff --git a/tests/ref/vsynth2/flashsv2 b/tests/ref/vsynth2/flashsv2 new file mode 100644 index 0000000000..93f429b7d7 --- /dev/null +++ b/tests/ref/vsynth2/flashsv2 @@ -0,0 +1,2 @@ +6fbb1cf84d473a93035047c3a3e344ff *./tests/data/vsynth2/flashsv2.flv +4814443 ./tests/data/vsynth2/flashsv2.flv |