Commit 54d213e9 authored by diego's avatar diego

cosmetics: Rename 'do_libav' function to 'do_lavf'.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18241 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 4a5c372b
...@@ -138,7 +138,7 @@ do_audio_decoding() ...@@ -138,7 +138,7 @@ do_audio_decoding()
do_ffmpeg $pcm_dst -i $target_path/$file -sample_fmt s16 -f wav do_ffmpeg $pcm_dst -i $target_path/$file -sample_fmt s16 -f wav
} }
do_libav() do_lavf()
{ {
file=${outfile}libav.$1 file=${outfile}libav.$1
do_ffmpeg $file -t 1 -qscale 10 -f image2 -vcodec pgmyuv -i $raw_src -f s16le -i $pcm_src $2 do_ffmpeg $file -t 1 -qscale 10 -f image2 -vcodec pgmyuv -i $raw_src -f s16le -i $pcm_src $2
...@@ -481,11 +481,11 @@ fi ...@@ -481,11 +481,11 @@ fi
# libavformat testing # libavformat testing
if [ -n "$do_avi" ] ; then if [ -n "$do_avi" ] ; then
do_libav avi do_lavf avi
fi fi
if [ -n "$do_asf" ] ; then if [ -n "$do_asf" ] ; then
do_libav asf "-acodec mp2" "-r 25" do_lavf asf "-acodec mp2" "-r 25"
fi fi
if [ -n "$do_rm" ] ; then if [ -n "$do_rm" ] ; then
...@@ -496,48 +496,48 @@ do_ffmpeg $file -t 1 -qscale 10 -f image2 -vcodec pgmyuv -i $raw_src -f s16le -i ...@@ -496,48 +496,48 @@ do_ffmpeg $file -t 1 -qscale 10 -f image2 -vcodec pgmyuv -i $raw_src -f s16le -i
fi fi
if [ -n "$do_mpg" ] ; then if [ -n "$do_mpg" ] ; then
do_libav mpg do_lavf mpg
fi fi
if [ -n "$do_mxf" ] ; then if [ -n "$do_mxf" ] ; then
do_libav mxf "-ar 48000 -bf 2 -timecode_frame_start 264363" do_lavf mxf "-ar 48000 -bf 2 -timecode_frame_start 264363"
do_libav mxf_d10 "-ar 48000 -ac 2 -r 25 -s 720x576 -padtop 32 -vcodec mpeg2video -intra -flags +ildct+low_delay -dc 10 -flags2 +ivlc+non_linear_q -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 -s 720x576 -padtop 32 -vcodec mpeg2video -intra -flags +ildct+low_delay -dc 10 -flags2 +ivlc+non_linear_q -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 fi
if [ -n "$do_ts" ] ; then if [ -n "$do_ts" ] ; then
do_libav ts do_lavf ts
fi fi
if [ -n "$do_swf" ] ; then if [ -n "$do_swf" ] ; then
do_libav swf -an do_lavf swf -an
fi fi
if [ -n "$do_ffm" ] ; then if [ -n "$do_ffm" ] ; then
do_libav ffm do_lavf ffm
fi fi
if [ -n "$do_flv_fmt" ] ; then if [ -n "$do_flv_fmt" ] ; then
do_libav flv -an do_lavf flv -an
fi fi
if [ -n "$do_mov" ] ; then if [ -n "$do_mov" ] ; then
do_libav mov "-acodec pcm_alaw" do_lavf mov "-acodec pcm_alaw"
fi fi
if [ -n "$do_dv_fmt" ] ; then if [ -n "$do_dv_fmt" ] ; then
do_libav dv "-ar 48000 -r 25 -s pal -ac 2" do_lavf dv "-ar 48000 -r 25 -s pal -ac 2"
fi fi
if [ -n "$do_gxf" ] ; then if [ -n "$do_gxf" ] ; then
do_libav gxf "-ar 48000 -r 25 -s pal -ac 1" do_lavf gxf "-ar 48000 -r 25 -s pal -ac 1"
fi fi
if [ -n "$do_nut" ] ; then if [ -n "$do_nut" ] ; then
do_libav nut "-acodec mp2" do_lavf nut "-acodec mp2"
fi fi
if [ -n "$do_mkv" ] ; then if [ -n "$do_mkv" ] ; then
do_libav mkv do_lavf mkv
fi fi
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment