diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-05 02:04:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-05 03:10:45 +0200 |
| commit | d2084402e6034e8d49ea50ebe212c4e8783d028a (patch) | |
| tree | 4887311120f2f7f5bdd105c919e60615ec9f53fb /tests/lavf-regression.sh | |
| parent | b881a2e254f3948a2ff1775a7e2ae58abdef96b6 (diff) | |
| parent | fb47997edb9d8ff16fc380d005a08c0545624aa6 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: fix type for thread_type option
avconv: move format to options context
avconv: move limit_filesize to options context
avconv: move start_time, recording_time and input_ts_offset to options context
avconv: add a context for options.
cmdutils: allow storing per-stream/chapter/.... options in a generic way
cmdutils: split per-option code out of parse_options().
cmdutils: add support for caller-provided option context.
cmdutils: declare only one pointer type in OptionDef
cmdutils: move grow_array() from avconv to cmdutils.
cmdutils: move exit_program() declaration to cmdutils from avconv
http: Consider the stream as seekable if the reply contains Accept-Ranges: bytes
nutenc: add namespace to the api facing functions
Conflicts:
avconv.c
cmdutils.c
cmdutils.h
ffmpeg.c
ffplay.c
ffprobe.c
ffserver.c
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/lavf-regression.sh')
| -rwxr-xr-x | tests/lavf-regression.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh index 27d1fdd4d2..ba5388eeab 100755 --- a/tests/lavf-regression.sh +++ b/tests/lavf-regression.sh @@ -227,8 +227,8 @@ conversions="yuv420p yuv422p yuv444p yuyv422 yuv410p yuv411p yuvj420p \ monob yuv440p yuvj440p" for pix_fmt in $conversions ; do file=${outfile}${pix_fmt}.yuv - run_avconv $DEC_OPTS -r 1 -t 1 -f image2 -vcodec pgmyuv -i $raw_src \ - $ENC_OPTS -f rawvideo -s 352x288 -pix_fmt $pix_fmt $target_path/$raw_dst + run_avconv $DEC_OPTS -r 1 -f image2 -vcodec pgmyuv -i $raw_src \ + $ENC_OPTS -f rawvideo -t 1 -s 352x288 -pix_fmt $pix_fmt $target_path/$raw_dst do_avconv $file $DEC_OPTS -f rawvideo -s 352x288 -pix_fmt $pix_fmt -i $target_path/$raw_dst \ $ENC_OPTS -f rawvideo -s 352x288 -pix_fmt yuv444p done |