aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoit Fouet <benoit.fouet@purplelabs.com>2007-02-20 10:07:56 +0000
committerPanagiotis Issaris <takis.issaris@uhasselt.be>2007-02-20 10:07:56 +0000
commit036bfd189f374fb6ece545c6bd6686bdd6b0c5ca (patch)
treec8e2f32e7845f8236ab29ebded4dd0d40f9b4664
parentab9c40872e509a97aaeefb1ab97d273ea4928aa5 (diff)
downloadffmpeg-036bfd189f374fb6ece545c6bd6686bdd6b0c5ca.tar.gz
Move the aframes option from the video "subsection" to the
audio "subsection". Patch by Benoit Fouet, benoit fouet % purplelabs com. Originally committed as revision 8037 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--ffmpeg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 5f79d7f6d3..41150223a5 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3589,7 +3589,6 @@ const OptionDef options[] = {
/* video options */
{ "vframes", OPT_INT | HAS_ARG | OPT_VIDEO, {(void*)&max_frames[CODEC_TYPE_VIDEO]}, "set the number of video frames to record", "number" },
- { "aframes", OPT_INT | HAS_ARG | OPT_AUDIO, {(void*)&max_frames[CODEC_TYPE_AUDIO]}, "set the number of audio frames to record", "number" },
{ "dframes", OPT_INT | HAS_ARG, {(void*)&max_frames[CODEC_TYPE_DATA]}, "set the number of data frames to record", "number" },
{ "r", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_rate}, "set frame rate (Hz value, fraction or abbreviation)", "rate" },
{ "s", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_size}, "set frame size (WxH or abbreviation)", "size" },
@@ -3635,6 +3634,7 @@ const OptionDef options[] = {
{ "qphist", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, { (void *)&qp_hist }, "show QP histogram" },
/* audio options */
+ { "aframes", OPT_INT | HAS_ARG | OPT_AUDIO, {(void*)&max_frames[CODEC_TYPE_AUDIO]}, "set the number of audio frames to record", "number" },
{ "ab", HAS_ARG | OPT_AUDIO, {(void*)opt_audio_bitrate}, "set audio bitrate (in kbit/s)", "bitrate", },
{ "aq", OPT_FLOAT | HAS_ARG | OPT_AUDIO, {(void*)&audio_qscale}, "set audio quality (codec-specific)", "quality", },
{ "ar", HAS_ARG | OPT_AUDIO, {(void*)opt_audio_rate}, "set audio sampling rate (in Hz)", "rate" },