On Wed, Feb 22, 2017 at 11:39 AM, Diego Biurrun <di...@biurrun.de> wrote:
> ---
> doc/encoders.texi | 2 +-
> doc/faq.texi | 8 ++++----
> doc/filters.texi | 4 ++--
> tests/fate-run.sh | 4 ++--
> tests/fate/demux.mak | 34 +++++++++++++++++-----------------
> tests/fate/h264.mak | 2 +-
> tests/fate/microsoft.mak | 2 +-
> tests/fate/mp3.mak | 14 +++++++-------
> tests/fate/mpc.mak | 4 ++--
> tests/fate/utvideo.mak | 2 +-
> tests/fate/video.mak | 4 ++--
> tests/fate/vqf.mak | 2 +-
> tests/lavf-regression.sh | 28 ++++++++++++++--------------
> 13 files changed, 55 insertions(+), 55 deletions(-)
>
> diff --git a/doc/encoders.texi b/doc/encoders.texi
> index bc5b336..41b8398 100644
> --- a/doc/encoders.texi
> +++ b/doc/encoders.texi
> @@ -38,7 +38,7 @@ always faster, just that one or the other may be better
> suited to a
> particular system. The floating-point encoder will generally produce better
> quality audio for a given bitrate. The @var{ac3_fixed} encoder is not the
> default codec for any of the output formats, so it must be specified
> explicitly
> -using the option @code{-acodec ac3_fixed} in order to use it.
> +using the option @code{-c:a ac3_fixed} in order to use it.
>
> @subsection AC-3 Metadata
>
> diff --git a/doc/faq.texi b/doc/faq.texi
> index b400124..f3d55bd 100644
> --- a/doc/faq.texi
> +++ b/doc/faq.texi
> @@ -234,7 +234,7 @@ mkfifo intermediate2.mpg
> avconv -i input1.avi -y intermediate1.mpg < /dev/null &
> avconv -i input2.avi -y intermediate2.mpg < /dev/null &
> cat intermediate1.mpg intermediate2.mpg |\
> -avconv -f mpeg -i - -c:v mpeg4 -acodec libmp3lame output.avi
> +avconv -f mpeg -i - -c:v mpeg4 -c:a libmp3lame output.avi
> @end example
>
> Similarly, the yuv4mpegpipe format, and the raw video, raw audio codecs also
> @@ -253,13 +253,13 @@ mkfifo temp2.a
> mkfifo temp2.v
> mkfifo all.a
> mkfifo all.v
> -avconv -i input1.flv -vn -f u16le -acodec pcm_s16le -ac 2 -ar 44100 - >
> temp1.a < /dev/null &
> -avconv -i input2.flv -vn -f u16le -acodec pcm_s16le -ac 2 -ar 44100 - >
> temp2.a < /dev/null &
> +avconv -i input1.flv -vn -f u16le -c:a pcm_s16le -ac 2 -ar 44100 - > temp1.a
> < /dev/null &
> +avconv -i input2.flv -vn -f u16le -c:a pcm_s16le -ac 2 -ar 44100 - > temp2.a
> < /dev/null &
> avconv -i input1.flv -an -f yuv4mpegpipe - > temp1.v < /dev/null &
> @{ avconv -i input2.flv -an -f yuv4mpegpipe - < /dev/null | tail -n +2 >
> temp2.v ; @} &
> cat temp1.a temp2.a > all.a &
> cat temp1.v temp2.v > all.v &
> -avconv -f u16le -acodec pcm_s16le -ac 2 -ar 44100 -i all.a \
> +avconv -f u16le -c:a pcm_s16le -ac 2 -ar 44100 -i all.a \
> -f yuv4mpegpipe -i all.v \
> -y output.flv
> rm temp[12].[av] all.[av]
> diff --git a/doc/filters.texi b/doc/filters.texi
> index 954765f..947fd79 100644
> --- a/doc/filters.texi
> +++ b/doc/filters.texi
> @@ -661,10 +661,10 @@ avconv -i HDCD16.flac -af hdcd OUT24.flac
>
> When using the filter with WAV, note that the default encoding for WAV is
> 16-bit,
> so the resulting 20-bit stream will be truncated back to 16-bit. Use
> something
> -like @command{-acodec pcm_s24le} after the filter to get 24-bit PCM output.
> +like @command{-c:a pcm_s24le} after the filter to get 24-bit PCM output.
> @example
> avconv -i HDCD16.wav -af hdcd OUT16.wav
> -avconv -i HDCD16.wav -af hdcd -acodec pcm_s24le OUT24.wav
> +avconv -i HDCD16.wav -af hdcd -c:a pcm_s24le OUT24.wav
> @end example
>
> The filter accepts the following options:
> diff --git a/tests/fate-run.sh b/tests/fate-run.sh
> index 623fd63..43fcee0 100755
> --- a/tests/fate-run.sh
> +++ b/tests/fate-run.sh
> @@ -164,8 +164,8 @@ video_filter(){
> label=${test#filter-}
> raw_src="${target_path}/tests/vsynth1/%02d.pgm"
> printf '%-20s' $label
> - avconv $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src \
> - $FLAGS $ENC_OPTS -vf "$filters" -vcodec rawvideo -frames:v 5 $* -f
> nut md5:
> + avconv $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src \
> + $FLAGS $ENC_OPTS -vf "$filters" -c:v rawvideo -frames:v 5 $* -f nut
> md5:
> }
>
> pixfmts(){
> diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak
> index d529341..44c4d6e 100644
> --- a/tests/fate/demux.mak
> +++ b/tests/fate/demux.mak
> @@ -1,26 +1,26 @@
> FATE_SAMPLES_AVCONV-$(call DEMDEC, AAC, AAC) += fate-adts-demux
> -fate-adts-demux: CMD = crc -i $(TARGET_SAMPLES)/aac/ct_faac-adts.aac -acodec
> copy
> +fate-adts-demux: CMD = crc -i $(TARGET_SAMPLES)/aac/ct_faac-adts.aac -c:a
> copy
>
> FATE_SAMPLES_AVCONV-$(CONFIG_AEA_DEMUXER) += fate-aea-demux
> -fate-aea-demux: CMD = crc -i $(TARGET_SAMPLES)/aea/chirp.aea -acodec copy
> +fate-aea-demux: CMD = crc -i $(TARGET_SAMPLES)/aea/chirp.aea -c:a copy
>
> FATE_SAMPLES_AVCONV-$(CONFIG_BINK_DEMUXER) += fate-bink-demux
> -fate-bink-demux: CMD = crc -i $(TARGET_SAMPLES)/bink/Snd0a7d9b58.dee -vn
> -acodec copy
> +fate-bink-demux: CMD = crc -i $(TARGET_SAMPLES)/bink/Snd0a7d9b58.dee -vn
> -c:a copy
>
> FATE_SAMPLES_AVCONV-$(CONFIG_CAF_DEMUXER) += fate-caf
> fate-caf: CMD = crc -i $(TARGET_SAMPLES)/caf/caf-pcm16.caf -c copy
>
> FATE_SAMPLES_AVCONV-$(CONFIG_CDXL_DEMUXER) += fate-cdxl-demux
> -fate-cdxl-demux: CMD = framecrc -i $(TARGET_SAMPLES)/cdxl/mirage.cdxl
> -vcodec copy -acodec copy
> +fate-cdxl-demux: CMD = framecrc -i $(TARGET_SAMPLES)/cdxl/mirage.cdxl -c copy
>
> FATE_SAMPLES_AVCONV-$(CONFIG_DAUD_DEMUXER) += fate-d-cinema-demux
> -fate-d-cinema-demux: CMD = framecrc -i
> $(TARGET_SAMPLES)/d-cinema/THX_Science_FLT_1920-partial.302 -acodec copy
> +fate-d-cinema-demux: CMD = framecrc -i
> $(TARGET_SAMPLES)/d-cinema/THX_Science_FLT_1920-partial.302 -c:a copy
>
> FATE_SAMPLES_AVCONV-$(call ALLYES, IV8_DEMUXER MPEG4VIDEO_PARSER) +=
> fate-iv8-demux
> -fate-iv8-demux: CMD = framecrc -i $(TARGET_SAMPLES)/iv8/zzz-partial.mpg
> -vcodec copy
> +fate-iv8-demux: CMD = framecrc -i $(TARGET_SAMPLES)/iv8/zzz-partial.mpg -c:v
> copy
>
> FATE_SAMPLES_AVCONV-$(call ALLYES, LMLM4_DEMUXER MPEG4VIDEO_PARSER) +=
> fate-lmlm4-demux
> -fate-lmlm4-demux: CMD = framecrc -i
> $(TARGET_SAMPLES)/lmlm4/LMLM4_CIFat30fps.divx -t 3 -acodec copy -vcodec copy
> +fate-lmlm4-demux: CMD = framecrc -i
> $(TARGET_SAMPLES)/lmlm4/LMLM4_CIFat30fps.divx -t 3 -c copy
>
> FATE_SAMPLES_AVCONV-$(CONFIG_XA_DEMUXER) += fate-maxis-xa
> fate-maxis-xa: CMD = framecrc -i $(TARGET_SAMPLES)/maxis-xa/SC2KBUG.XA
> -frames:a 30 -c:a copy
> @@ -29,28 +29,28 @@ FATE_SAMPLES_AVCONV-$(CONFIG_MTV_DEMUXER) += fate-mtv
> fate-mtv: CMD = framecrc -i $(TARGET_SAMPLES)/mtv/comedian_auto-partial.mtv
> -c copy
>
> FATE_SAMPLES_AVCONV-$(call DEMDEC, MXF, MPEG4) += fate-mxf-demux
> -fate-mxf-demux: CMD = framecrc -i $(TARGET_SAMPLES)/mxf/C0023S01.mxf -acodec
> copy -vcodec copy
> +fate-mxf-demux: CMD = framecrc -i $(TARGET_SAMPLES)/mxf/C0023S01.mxf -c copy
>
> FATE_SAMPLES_AVCONV-$(call ALLYES, NC_DEMUXER MPEG4VIDEO_PARSER) +=
> fate-nc-demux
> -fate-nc-demux: CMD = framecrc -i
> $(TARGET_SAMPLES)/nc-camera/nc-sample-partial -vcodec copy
> +fate-nc-demux: CMD = framecrc -i
> $(TARGET_SAMPLES)/nc-camera/nc-sample-partial -c:v copy
>
> FATE_SAMPLES_AVCONV-$(CONFIG_NSV_DEMUXER) += fate-nsv-demux
> -fate-nsv-demux: CMD = framecrc -i
> $(TARGET_SAMPLES)/nsv/witchblade-51kbps.nsv -t 6 -vcodec copy -acodec copy
> +fate-nsv-demux: CMD = framecrc -i
> $(TARGET_SAMPLES)/nsv/witchblade-51kbps.nsv -t 6 -c copy
>
> FATE_SAMPLES_AVCONV-$(CONFIG_OMA_DEMUXER) += fate-oma-demux
> -fate-oma-demux: CMD = crc -i $(TARGET_SAMPLES)/oma/01-Untitled-partial.oma
> -acodec copy
> +fate-oma-demux: CMD = crc -i $(TARGET_SAMPLES)/oma/01-Untitled-partial.oma
> -c:a copy
>
> FATE_SAMPLES_AVCONV-$(CONFIG_STR_DEMUXER) += fate-psx-str-demux
> fate-psx-str-demux: CMD = framecrc -i
> $(TARGET_SAMPLES)/psx-str/descent-partial.str -c copy
>
> FATE_SAMPLES_AVCONV-$(CONFIG_PVA_DEMUXER) += fate-pva-demux
> -fate-pva-demux: CMD = framecrc -idct simple -i
> $(TARGET_SAMPLES)/pva/PVA_test-partial.pva -t 0.6 -acodec copy -vn
> +fate-pva-demux: CMD = framecrc -idct simple -i
> $(TARGET_SAMPLES)/pva/PVA_test-partial.pva -t 0.6 -c:a copy -vn
>
> FATE_SAMPLES_AVCONV-$(CONFIG_QCP_DEMUXER) += fate-qcp-demux
> -fate-qcp-demux: CMD = crc -i $(TARGET_SAMPLES)/qcp/0036580847.QCP -acodec
> copy
> +fate-qcp-demux: CMD = crc -i $(TARGET_SAMPLES)/qcp/0036580847.QCP -c:a copy
>
> FATE_SAMPLES_AVCONV-$(CONFIG_R3D_DEMUXER) += fate-redcode-demux
> -fate-redcode-demux: CMD = framecrc -i $(TARGET_SAMPLES)/r3d/4MB-sample.r3d
> -vcodec copy -acodec copy
> +fate-redcode-demux: CMD = framecrc -i $(TARGET_SAMPLES)/r3d/4MB-sample.r3d
> -c copy
>
> FATE_SAMPLES_AVCONV-$(CONFIG_SIFF_DEMUXER) += fate-siff-demux
> fate-siff-demux: CMD = framecrc -i $(TARGET_SAMPLES)/SIFF/INTRO_B.VB -c copy
> @@ -62,10 +62,10 @@ FATE_SAMPLES_AVCONV-$(CONFIG_WSAUD_DEMUXER) +=
> fate-westwood-aud
> fate-westwood-aud: CMD = framecrc -i
> $(TARGET_SAMPLES)/westwood-aud/excellent.aud -c copy
>
> FATE_SAMPLES_AVCONV-$(call ALLYES, WTV_DEMUXER MPEGVIDEO_PARSER) +=
> fate-wtv-demux
> -fate-wtv-demux: CMD = framecrc -i
> $(TARGET_SAMPLES)/wtv/law-and-order-partial.wtv -vcodec copy -acodec copy
> +fate-wtv-demux: CMD = framecrc -i
> $(TARGET_SAMPLES)/wtv/law-and-order-partial.wtv -c copy
>
> FATE_SAMPLES_AVCONV-$(CONFIG_XMV_DEMUXER) += fate-xmv-demux
> -fate-xmv-demux: CMD = framecrc -i $(TARGET_SAMPLES)/xmv/logos1p.fmv -vcodec
> copy -acodec copy
> +fate-xmv-demux: CMD = framecrc -i $(TARGET_SAMPLES)/xmv/logos1p.fmv -c copy
>
> FATE_SAMPLES_AVCONV-$(CONFIG_XWMA_DEMUXER) += fate-xwma-demux
> -fate-xwma-demux: CMD = crc -i $(TARGET_SAMPLES)/xwma/ergon.xwma -acodec copy
> +fate-xwma-demux: CMD = crc -i $(TARGET_SAMPLES)/xwma/ergon.xwma -c:a copy
> diff --git a/tests/fate/h264.mak b/tests/fate/h264.mak
> index 3d6fde7..bdc390d 100644
> --- a/tests/fate/h264.mak
> +++ b/tests/fate/h264.mak
> @@ -386,7 +386,7 @@ fate-h264-conformance-sva_fm1_e: CMD =
> framecrc -i $(TARGET_SAM
> fate-h264-conformance-sva_nl1_b: CMD = framecrc -i
> $(TARGET_SAMPLES)/h264-conformance/SVA_NL1_B.264
> fate-h264-conformance-sva_nl2_e: CMD = framecrc -i
> $(TARGET_SAMPLES)/h264-conformance/SVA_NL2_E.264
>
> -fate-h264-bsf-mp4toannexb: CMD = md5 -i
> $(TARGET_SAMPLES)/h264/interlaced_crop.mp4 -vcodec copy -bsf h264_mp4toannexb
> -f h264
> +fate-h264-bsf-mp4toannexb: CMD = md5 -i
> $(TARGET_SAMPLES)/h264/interlaced_crop.mp4 -c:v copy -bsf h264_mp4toannexb -f
> h264
> fate-h264-crop-to-container: CMD = framemd5 -i
> $(TARGET_SAMPLES)/h264/crop-to-container-dims-canon.mov
> fate-h264-direct-bff: CMD = framecrc -i
> $(TARGET_SAMPLES)/h264/direct-bff.mkv
> fate-h264-extradata-reload: CMD = framemd5 -i
> $(TARGET_SAMPLES)/h264/extradata-reload-multi-stsd.mov
> diff --git a/tests/fate/microsoft.mak b/tests/fate/microsoft.mak
> index de53f00..5b32c7f 100644
> --- a/tests/fate/microsoft.mak
> +++ b/tests/fate/microsoft.mak
> @@ -39,7 +39,7 @@ FATE_WMV8_DRM += fate-wmv8-drm
> fate-wmv8-drm: CMD = framecrc -cryptokey
> 137381538c84c068111902a59c5cf6c340247c39 -i
> $(TARGET_SAMPLES)/wmv8/wmv_drm.wmv -an -frames:v 129
>
> FATE_WMV8_DRM += fate-wmv8-drm-nodec
> -fate-wmv8-drm-nodec: CMD = framecrc -cryptokey
> 137381538c84c068111902a59c5cf6c340247c39 -i
> $(TARGET_SAMPLES)/wmv8/wmv_drm.wmv -acodec copy -vcodec copy
> +fate-wmv8-drm-nodec: CMD = framecrc -cryptokey
> 137381538c84c068111902a59c5cf6c340247c39 -i
> $(TARGET_SAMPLES)/wmv8/wmv_drm.wmv -c copy
>
> FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, WMV3) += $(FATE_WMV8_DRM)
> fate-wmv8_drm: $(FATE_WMV8_DRM)
> diff --git a/tests/fate/mp3.mak b/tests/fate/mp3.mak
> index 78832cb..3af3135 100644
> --- a/tests/fate/mp3.mak
> +++ b/tests/fate/mp3.mak
> @@ -1,29 +1,29 @@
> FATE_MP3 += fate-mp3-float-conf-compl
> -fate-mp3-float-conf-compl: CMD = avconv -acodec mp3float -i
> $(TARGET_SAMPLES)/mp3-conformance/compl.bit -f f32le -
> +fate-mp3-float-conf-compl: CMD = avconv -c:a mp3float -i
> $(TARGET_SAMPLES)/mp3-conformance/compl.bit -f f32le -
> fate-mp3-float-conf-compl: REF = $(SAMPLES)/mp3-conformance/compl.f32
>
> FATE_MP3 += fate-mp3-float-conf-he_32khz
> -fate-mp3-float-conf-he_32khz: CMD = avconv -acodec mp3float -i
> $(TARGET_SAMPLES)/mp3-conformance/he_32khz.bit -af atrim=end_sample=171648 -f
> f32le -
> +fate-mp3-float-conf-he_32khz: CMD = avconv -c:a mp3float -i
> $(TARGET_SAMPLES)/mp3-conformance/he_32khz.bit -af atrim=end_sample=171648 -f
> f32le -
> fate-mp3-float-conf-he_32khz: REF = $(SAMPLES)/mp3-conformance/he_32khz.f32
>
> FATE_MP3 += fate-mp3-float-conf-he_44khz
> -fate-mp3-float-conf-he_44khz: CMD = avconv -acodec mp3float -i
> $(TARGET_SAMPLES)/mp3-conformance/he_44khz.bit -af atrim=end_sample=471168 -f
> f32le -
> +fate-mp3-float-conf-he_44khz: CMD = avconv -c:a mp3float -i
> $(TARGET_SAMPLES)/mp3-conformance/he_44khz.bit -af atrim=end_sample=471168 -f
> f32le -
> fate-mp3-float-conf-he_44khz: REF = $(SAMPLES)/mp3-conformance/he_44khz.f32
>
> FATE_MP3 += fate-mp3-float-conf-he_48khz
> -fate-mp3-float-conf-he_48khz: CMD = avconv -acodec mp3float -i
> $(TARGET_SAMPLES)/mp3-conformance/he_48khz.bit -af atrim=end_sample=171648 -f
> f32le -
> +fate-mp3-float-conf-he_48khz: CMD = avconv -c:a mp3float -i
> $(TARGET_SAMPLES)/mp3-conformance/he_48khz.bit -af atrim=end_sample=171648 -f
> f32le -
> fate-mp3-float-conf-he_48khz: REF = $(SAMPLES)/mp3-conformance/he_48khz.f32
>
> FATE_MP3 += fate-mp3-float-conf-hecommon
> -fate-mp3-float-conf-hecommon: CMD = avconv -acodec mp3float -i
> $(TARGET_SAMPLES)/mp3-conformance/hecommon.bit -af atrim=end_sample=33408 -f
> f32le -
> +fate-mp3-float-conf-hecommon: CMD = avconv -c:a mp3float -i
> $(TARGET_SAMPLES)/mp3-conformance/hecommon.bit -af atrim=end_sample=33408 -f
> f32le -
> fate-mp3-float-conf-hecommon: REF = $(SAMPLES)/mp3-conformance/hecommon.f32
>
> FATE_MP3 += fate-mp3-float-conf-si
> -fate-mp3-float-conf-si: CMD = avconv -acodec mp3float -i
> $(TARGET_SAMPLES)/mp3-conformance/si.bit -af atrim=end_sample=134784 -f f32le
> -
> +fate-mp3-float-conf-si: CMD = avconv -c:a mp3float -i
> $(TARGET_SAMPLES)/mp3-conformance/si.bit -af atrim=end_sample=134784 -f f32le
> -
> fate-mp3-float-conf-si: REF = $(SAMPLES)/mp3-conformance/si.f32
>
> FATE_MP3 += fate-mp3-float-conf-si_block
> -fate-mp3-float-conf-si_block: CMD = avconv -acodec mp3float -i
> $(TARGET_SAMPLES)/mp3-conformance/si_block.bit -af atrim=end_sample=72576 -f
> f32le -
> +fate-mp3-float-conf-si_block: CMD = avconv -c:a mp3float -i
> $(TARGET_SAMPLES)/mp3-conformance/si_block.bit -af atrim=end_sample=72576 -f
> f32le -
> fate-mp3-float-conf-si_block: REF = $(SAMPLES)/mp3-conformance/si_block.f32
>
> FATE_MP3 += fate-mp3-float-extra_overread
> diff --git a/tests/fate/mpc.mak b/tests/fate/mpc.mak
> index 4a01273..294dffe 100644
> --- a/tests/fate/mpc.mak
> +++ b/tests/fate/mpc.mak
> @@ -1,8 +1,8 @@
> FATE_MPC-$(CONFIG_MPC_DEMUXER) += fate-mpc7-demux
> -fate-mpc7-demux: CMD = crc -i $(TARGET_SAMPLES)/musepack/inside-mp7.mpc
> -acodec copy
> +fate-mpc7-demux: CMD = crc -i $(TARGET_SAMPLES)/musepack/inside-mp7.mpc -c:a
> copy
>
> FATE_MPC-$(CONFIG_MPC8_DEMUXER) += fate-mpc8-demux
> -fate-mpc8-demux: CMD = crc -i $(TARGET_SAMPLES)/musepack/inside-mp8.mpc
> -acodec copy
> +fate-mpc8-demux: CMD = crc -i $(TARGET_SAMPLES)/musepack/inside-mp8.mpc -c:a
> copy
>
> FATE_MPC-$(call DEMDEC, MPC, MPC7) += fate-musepack7
> fate-musepack7: CMD = pcm -i $(TARGET_SAMPLES)/musepack/inside-mp7.mpc
> diff --git a/tests/fate/utvideo.mak b/tests/fate/utvideo.mak
> index 4c0c6bf..cbd7ad1 100644
> --- a/tests/fate/utvideo.mak
> +++ b/tests/fate/utvideo.mak
> @@ -28,7 +28,7 @@ fate-utvideo_yuv422_median: CMD = framecrc -i
> $(TARGET_SAMPLES)/utvideo/utvideo_
> FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, UTVIDEO) += $(FATE_UTVIDEO)
> fate-utvideo: $(FATE_UTVIDEO)
>
> -fate-utvideoenc%: CMD = framemd5 -f image2 -vcodec pgmyuv -i
> $(TARGET_PATH)/tests/vsynth1/%02d.pgm -vcodec utvideo -slices 1 -f avi
> -sws_flags +accurate_rnd+bitexact ${OPTS}
> +fate-utvideoenc%: CMD = framemd5 -f image2 -c:v pgmyuv -i
> $(TARGET_PATH)/tests/vsynth1/%02d.pgm -c:v utvideo -slices 1 -f avi
> -sws_flags +accurate_rnd+bitexact ${OPTS}
>
> FATE_UTVIDEOENC += fate-utvideoenc_rgba_left
> fate-utvideoenc_rgba_left: OPTS = -pix_fmt rgba -pred left
> diff --git a/tests/fate/video.mak b/tests/fate/video.mak
> index bd5d3ca..fd15e83 100644
> --- a/tests/fate/video.mak
> +++ b/tests/fate/video.mak
> @@ -140,7 +140,7 @@ FATE_SAMPLES_AVCONV-$(call DEMDEC, IDCIN, IDCIN) +=
> fate-id-cin-video
> fate-id-cin-video: CMD = framecrc -i $(TARGET_SAMPLES)/idcin/idlog-2MB.cin
> -pix_fmt rgb24
>
> FATE_SAMPLES_AVCONV-$(call ENCDEC, ROQ PGMYUV, ROQ IMAGE2) +=
> fate-idroq-video-encode
> -fate-idroq-video-encode: CMD = md5 -f image2 -vcodec pgmyuv -i
> $(TARGET_SAMPLES)/ffmpeg-synthetic/vsynth1/%02d.pgm -sws_flags +bitexact -vf
> pad=512:512:80:112 -f roq -t 0.2
> +fate-idroq-video-encode: CMD = md5 -f image2 -c:v pgmyuv -i
> $(TARGET_SAMPLES)/ffmpeg-synthetic/vsynth1/%02d.pgm -sws_flags +bitexact -vf
> pad=512:512:80:112 -f roq -t 0.2
>
> FATE_HAP += fate-hap1
> fate-hap1: CMD = framecrc -i $(TARGET_SAMPLES)/hap/hap1.mov
> @@ -308,7 +308,7 @@ fate-v410dec: CMD = framecrc -i
> $(TARGET_SAMPLES)/v410/lenav410.mov -pix_fmt yuv
>
> FATE_SAMPLES_AVCONV-$(call ENCDEC, V410 PGMYUV, AVI IMAGE2) += fate-v410enc
> fate-v410enc: $(VREF)
> -fate-v410enc: CMD = md5 -f image2 -vcodec pgmyuv -i
> $(TARGET_PATH)/tests/vsynth1/%02d.pgm -fflags +bitexact -vcodec v410 -f avi
> +fate-v410enc: CMD = md5 -f image2 -c:v pgmyuv -i
> $(TARGET_PATH)/tests/vsynth1/%02d.pgm -fflags +bitexact -c:v v410 -f avi
>
> FATE_SAMPLES_AVCONV-$(call DEMDEC, SIFF, VB) += fate-vb
> fate-vb: CMD = framecrc -i $(TARGET_SAMPLES)/SIFF/INTRO_B.VB -t 3 -pix_fmt
> rgb24 -an
> diff --git a/tests/fate/vqf.mak b/tests/fate/vqf.mak
> index 355bab0..89dbcb1 100644
> --- a/tests/fate/vqf.mak
> +++ b/tests/fate/vqf.mak
> @@ -4,4 +4,4 @@ fate-twinvq: CMP = oneoff
> fate-twinvq: REF = $(SAMPLES)/vqf/achterba.pcm
>
> FATE_SAMPLES_AVCONV-$(CONFIG_VQF_DEMUXER) += fate-vqf-demux
> -fate-vqf-demux: CMD = md5 -i $(TARGET_SAMPLES)/vqf/achterba.vqf -acodec copy
> -f framecrc
> +fate-vqf-demux: CMD = md5 -i $(TARGET_SAMPLES)/vqf/achterba.vqf -c:a copy -f
> framecrc
> diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh
> index 3c18b2f..fd4f554 100755
> --- a/tests/lavf-regression.sh
> +++ b/tests/lavf-regression.sh
> @@ -14,14 +14,14 @@ eval do_$test=y
> do_lavf()
> {
> file=${outfile}lavf.$1
> - do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $DEC_OPTS
> -ar 44100 -f s16le $2 -i $pcm_src $ENC_OPTS -b:a 64k -t 1 -qscale:v 10 $3
> + do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $DEC_OPTS
> -ar 44100 -f s16le $2 -i $pcm_src $ENC_OPTS -b:a 64k -t 1 -qscale:v 10 $3
> do_avconv_crc $file $DEC_OPTS -i $target_path/$file $4
> }
>
> do_streamed_images()
> {
> file=${outfile}${1}pipe.$1
> - do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src -f
> image2pipe $ENC_OPTS -t 1 -qscale 10
> + do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src -f
> image2pipe $ENC_OPTS -t 1 -qscale 10
> do_avconv_crc $file $DEC_OPTS -f image2pipe -i $target_path/$file
> }
>
> @@ -30,7 +30,7 @@ do_image_formats()
> outfile="$datadir/images/$1/"
> mkdir -p "$outfile"
> file=${outfile}%02d.$1
> - run_avconv $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $2 $ENC_OPTS
> $3 -frames 12 -y -qscale 10 $target_path/$file
> + run_avconv $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $2 $ENC_OPTS $3
> -frames 12 -y -qscale 10 $target_path/$file
> do_md5sum ${outfile}02.$1
> do_avconv_crc $file $DEC_OPTS $3 -i $target_path/$file
> echo $(wc -c ${outfile}02.$1)
> @@ -44,16 +44,16 @@ do_audio_only()
> }
>
> if [ -n "$do_avi" ] ; then
> -do_lavf avi "" "-acodec mp2 -ar 44100"
> +do_lavf avi "" "-c:a mp2 -ar 44100"
> fi
>
> if [ -n "$do_asf" ] ; then
> -do_lavf asf "" "-acodec mp2 -ar 44100" "-r 25"
> +do_lavf asf "" "-c:a mp2 -ar 44100" "-r 25"
> fi
>
> if [ -n "$do_rm" ] ; then
> file=${outfile}lavf.rm
> -do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $DEC_OPTS -ar
> 44100 -f s16le -i $pcm_src $ENC_OPTS -t 1 -qscale 10 -acodec ac3_fixed -b:a
> 64k
> +do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $DEC_OPTS -ar
> 44100 -f s16le -i $pcm_src $ENC_OPTS -t 1 -qscale 10 -c:a ac3_fixed -b:a 64k
> # broken
> #do_avconv_crc $file -i $target_path/$file
> fi
> @@ -67,7 +67,7 @@ do_lavf mxf "-ar 48000" "-bf 2 -timecode_frame_start 264363"
> fi
>
> if [ -n "$do_mxf_d10" ]; then
> -do_lavf mxf_d10 "-ar 48000 -ac 2" "-r 25 -vf scale=720:576,pad=720:608:0:32
> -vcodec mpeg2video -g 0 -flags +ildct+low_delay -dc 10 -non_linear_quant 1
> -intra_vlc 1 -qscale 1 -ps 1 -qmin 1 -rc_max_vbv_use 1 -rc_min_vbv_use 1
> -pix_fmt yuv422p -minrate 30000k -maxrate 30000k -b 30000k -bufsize 1200000
> -top 1 -rc_init_occupancy 1200000 -qmax 12 -f mxf_d10"
> +do_lavf mxf_d10 "-ar 48000 -ac 2" "-r 25 -vf scale=720:576,pad=720:608:0:32
> -c:v mpeg2video -g 0 -flags +ildct+low_delay -dc 10 -non_linear_quant 1
> -intra_vlc 1 -qscale 1 -ps 1 -qmin 1 -rc_max_vbv_use 1 -rc_min_vbv_use 1
> -pix_fmt yuv422p -minrate 30000k -maxrate 30000k -b 30000k -bufsize 1200000
> -top 1 -rc_init_occupancy 1200000 -qmax 12 -f mxf_d10"
> fi
>
> if [ -n "$do_ts" ] ; then
> @@ -83,7 +83,7 @@ do_lavf flv "" "-an"
> fi
>
> if [ -n "$do_mov" ] ; then
> -do_lavf mov "" "-acodec pcm_alaw -c:v mpeg4"
> +do_lavf mov "" "-c:a pcm_alaw -c:v mpeg4"
> fi
>
> if [ -n "$do_dv_fmt" ] ; then
> @@ -95,7 +95,7 @@ do_lavf gxf "-ar 48000" "-r 25 -s pal -ac 1"
> fi
>
> if [ -n "$do_nut" ] ; then
> -do_lavf nut "" "-acodec mp2 -ar 44100"
> +do_lavf nut "" "-c:a mp2 -ar 44100"
> fi
>
> if [ -n "$do_mkv" ] ; then
> @@ -106,7 +106,7 @@ fi
> # streamed images
> # mjpeg
> #file=${outfile}lavf.mjpeg
> -#do_avconv $file -t 1 -qscale 10 -f image2 -vcodec pgmyuv -i $raw_src
> +#do_avconv $file -t 1 -qscale 10 -f image2 -c:v pgmyuv -i $raw_src
> #do_avconv_crc $file -i $target_path/$file
>
> if [ -n "$do_pbmpipe" ] ; then
> @@ -123,13 +123,13 @@ fi
>
> if [ -n "$do_gif" ] ; then
> file=${outfile}lavf.gif
> -do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $ENC_OPTS -t
> 1 -qscale 10 -pix_fmt rgb24
> +do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $ENC_OPTS -t 1
> -qscale 10 -pix_fmt rgb24
> do_avconv_crc $file $DEC_OPTS -i $target_path/$file -pix_fmt rgb24
> fi
>
> if [ -n "$do_yuv4mpeg" ] ; then
> file=${outfile}lavf.y4m
> -do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $ENC_OPTS -t
> 1 -qscale 10
> +do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $ENC_OPTS -t 1
> -qscale 10
> #do_avconv_crc $file -i $target_path/$file
> fi
>
> @@ -218,7 +218,7 @@ do_audio_only voc
> fi
>
> if [ -n "$do_voc_s16" ] ; then
> -do_audio_only s16.voc "-ac 2" "-acodec pcm_s16le"
> +do_audio_only s16.voc "-ac 2" "-c:a pcm_s16le"
> fi
>
> if [ -n "$do_ogg" ] ; then
> @@ -243,7 +243,7 @@ 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 -f image2 -vcodec pgmyuv -i $raw_src \
> + run_avconv $DEC_OPTS -r 1 -f image2 -c:v 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
> --
> 2.1.4
>
ok
--
Vittorio
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
