diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-29 03:56:31 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-29 04:16:26 +0400 |
commit | 706bd8ea19a6f723795547885714033ac68a4d74 (patch) | |
tree | 39f7933c9432b35801c81903fa7dc352de92fe95 /tests/audiogen.c | |
parent | 0f8f9248471bbee5649c8efdc52d02c1cf93bba1 (diff) | |
parent | c83f44dba11930744e167856b48fbc24a8ff0e63 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (35 commits)
h264_idct_10bit: port x86 assembly to cpuflags.
x86inc: clip num_args to 7 on x86-32.
x86inc: sync to latest version from x264.
fft: rename "z" to "zc" to prevent name collision.
wv: return meaningful error codes.
wv: return AVERROR_EOF on EOF, not EIO.
mp3dec: forward errors for av_get_packet().
mp3dec: remove a pointless local variable.
mp3dec: remove commented out cruft.
lavfi: bump minor to mark stabilizing the ABI.
FATE: add tests for yadif.
FATE: add a test for delogo video filter.
FATE: add a test for amix audio filter.
audiogen: allow specifying random seed as a commandline parameter.
vc1dec: Override invalid macroblock quantizer
vc1: avoid reading beyond the last line in vc1_draw_sprites()
vc1dec: check that coded slice positions and interlacing match.
vc1dec: Do not ignore ff_vc1_parse_frame_header_adv return value
configure: Move parts that should not be user-selectable to CONFIG_EXTRA
lavf: remove commented out cruft in avformat_find_stream_info()
...
Conflicts:
Makefile
configure
libavcodec/vc1dec.c
libavcodec/x86/h264_deblock.asm
libavcodec/x86/h264_deblock_10bit.asm
libavcodec/x86/h264dsp_mmx.c
libavfilter/version.h
libavformat/mp3dec.c
libavformat/utils.c
libavformat/wv.c
libavutil/x86/x86inc.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/audiogen.c')
-rw-r--r-- | tests/audiogen.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/audiogen.c b/tests/audiogen.c index 5818797a65..07f0be32eb 100644 --- a/tests/audiogen.c +++ b/tests/audiogen.c @@ -144,8 +144,8 @@ int main(int argc, char **argv) int nb_channels = 2; char *ext; - if (argc < 2 || argc > 4) { - printf("usage: %s file [<sample rate> [<channels>]]\n" + if (argc < 2 || argc > 5) { + printf("usage: %s file [<sample rate> [<channels>] [<random seed>]]\n" "generate a test raw 16 bit audio stream\n" "If the file extension is .wav a WAVE header will be added.\n" "default: 44100 Hz stereo\n", argv[0]); @@ -168,6 +168,9 @@ int main(int argc, char **argv) } } + if (argc > 4) + seed = atoi(argv[4]); + outfile = fopen(argv[1], "wb"); if (!outfile) { perror(argv[1]); |