8ec19f84e1
cmdutils: add codec_opts parameter to setup_find_stream_info_opts()
...
Avoid brittle and obfuscating reference to a global.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-07-28 17:13:14 +02:00
08e09ed7db
ffmpeg: fix some indentation
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-17 17:10:47 +01:00
e9f98c9022
ffmpeg: fix operation with --disable-avfilter
...
The width and height must be copied from the input before
being used.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-17 17:10:37 +01:00
daca33659d
ffmpeg: Fix the check for experimental codecs
...
The variable 'codec' was used uninitialized here.
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-07-14 23:37:18 +03:00
8d03ca085f
ffmpeg: print the low bitrate warning after the codec is openend.
...
This doesn't access avcodec_opts, so it works with the new options
passing system.
Makes opt_bitrate() unneeded, so it's removed.
2011-07-14 14:15:41 +02:00
bf174a70cd
ffmpeg: use new avcodec_open2 and avformat_find_stream_info API.
2011-07-13 23:17:42 +02:00
a9eb4f0899
ffmpeg: check experimental flag after codec is opened.
...
This doesn't access avcodec_opts, so it will work with the new options
passing system.
2011-07-13 23:17:42 +02:00
8e2d085516
ffmpeg: do not set GLOBAL_HEADER flag in the options context
...
The removed lines have no effect, since the flag is set on all encoder
for the given file and avcodec_opts are reset between files.
2011-07-13 23:17:42 +02:00
71a1d1116f
Replace some gotos that lead to single return statements by direct return.
2011-07-13 17:53:49 +02:00
c7dd3e7e43
ffmpeg: get rid of a pointless limit on number of streams.
2011-07-13 10:37:24 +02:00
646a9a1893
ffmpeg: remove an unused define.
2011-07-13 10:37:20 +02:00
5f847bf61d
lavf: deprecate AVFormatContext.timestamp
...
It's replaced by 'creation_time' metadata tag.
2011-07-12 15:30:10 +02:00
b12c259252
ffmpeg: merge input_files_ts_scale into InputStream.
2011-07-12 15:29:21 +02:00
6fbf2485ad
ffmpeg: don't abuse a global for passing sample format from input to output
...
It's broken with multiple files or audio streams.
2011-07-12 15:28:53 +02:00
87c739a395
ffmpeg: don't abuse a global for passing channel layout from input to output
...
It's broken with multiple files or audio streams.
2011-07-12 15:28:22 +02:00
1cede1d011
ffmpeg: factor common code from new_a/v/s/d_stream to new_output_stream()
2011-07-12 15:26:04 +02:00
e98bc78ca1
ffmpeg: remove unused variables from InputStream.
2011-07-08 19:58:23 +02:00
20f9f21fd4
ffmpeg: remove pointless if (nb_input_files)
...
It's required to be non-zero since
cc58300e30
2011-07-08 19:58:23 +02:00
27e91f37f5
ffmpeg: merge input_files_ts_offset into input_files.
2011-07-08 19:58:23 +02:00
9e253c13d0
ffmpeg: merge input_codecs into input_streams.
...
There's no point in keeping them separate.
2011-07-08 19:58:23 +02:00
17c8cc550d
ffmpeg: drop AV prefixes from struct names.
...
Those are reserved for the libs.
2011-07-08 19:58:22 +02:00
f5302e5dcf
ffmpeg: deprecate loop_input and loop_output options
...
They were replaced by (de)muxer private options.
2011-07-08 19:58:19 +02:00
5e8d2e337e
lavf: deprecate AVStream.quality.
...
AVStream is no place for it and it's unused outside of ffmpeg anyway.
2011-07-06 20:10:41 +02:00
0ebcdf5cda
Do not include mathematics.h in avutil.h
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-03 21:42:06 +01:00
f6d6783a4d
ffmpeg: use av_get_bytes_per_sample() in place of av_get_bits_per_sample_fmt()
...
av_get_bits_per_sample_fmt() was deprecated.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-07-02 08:33:51 -07:00
e6c52cee54
Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample().
...
av_get_bits_per_sample_fmt() is deprecated.
2011-06-20 18:56:06 -04:00
55ba12e300
ffmpeg: deprecate -vc and -tvstd
...
They've been replaced by demuxer private options.
2011-06-16 20:24:57 +02:00
8035f42968
ffmpeg: use new avformat_open_* API.
2011-06-16 20:24:57 +02:00
0b7ccad6bf
ffmpeg: don't abuse a global for passing frame size from input to output
...
It's broken with multiple files or video streams.
2011-06-16 20:24:55 +02:00
10de86b882
ffmpeg: don't abuse a global for passing pixel format from input to output
...
It's broken with multiple files or video streams.
2011-06-16 20:24:50 +02:00
62940bb42f
ffmpeg: initialise encoders earlier.
...
Fixes choosing supported samplerate and framerate.
2011-06-16 20:11:08 +02:00
9446d75941
ffmpeg: merge output_codecs array into AVOutputStream members.
...
There's no point in keeping them separate.
2011-06-16 20:11:08 +02:00
a6286bda09
ffmpeg: don't abuse a global for passing framerate from input to output
...
It's broken with multiple files or video streams.
2011-06-15 21:57:53 +02:00
8f3e999736
ffmpeg: don't abuse a global for passing channels from input to output
...
It's broken with multiple files or audio streams.
2011-06-15 21:57:52 +02:00
d7ee44024c
ffmpeg: don't abuse a global for passing samplerate from input to output
...
It's broken with multiple files or audio streams.
This removes the default samplerate of 44100 for raw input, hence all
the FATE changes.
2011-06-15 21:57:52 +02:00
0be3736796
ffmpeg: fix streaming to ffserver.
2011-06-14 15:59:15 -04:00
9a1b79128c
ffmpeg.c: Add a necessary const qualifier
2011-06-09 10:12:50 -07:00
d2d67e424f
Remove all uses of now deprecated metadata functions.
2011-06-08 07:43:45 +02:00
94bed8e582
Replace avcodec_get_pix_fmt_name() by av_get_pix_fmt_name().
...
This fixes warnings about avcodec_get_pix_fmt_name() being deprecated.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-06-03 13:55:55 +02:00
e65ab9d94f
Remove unused variables
2011-06-02 20:06:00 +01:00
26513856d6
cmdutils: remove OPT_FUNC2
...
Make ff* tools only accept opt_* functions taking two arguments.
The distinction between functions with one and two arguments is quite
pointless. Simplify parse_options() code.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-05-28 09:40:19 -04:00
db3262b700
ffserver: Fix a null pointer dereference as a result of the FF_API_MAX_STREAMS cleanup.
...
Fixed another dereference in the RTSP code.
Removed a useless variable.
Changed an unnecessary looping assignment to a simple assignment suggested by
Maksym.
Added fixes and tweaks suggested by Maksym Veremeyenko [verem@m1stereo.tv ] and
Clément B.
2011-05-26 12:57:59 +02:00
2cf8355f98
ffmpeg: get rid of useless AVInputStream.nb_streams.
...
It's a duplicate of AVFormatContext.nb_streams.
2011-05-25 15:55:47 +02:00
07633154ad
ffmpeg: simplify managing input files and streams
...
Grow the file and stream list in opt_input_file() instead of creating it
all at once in transcode(). This is simpler and will be useful for
following commits.
2011-05-25 15:55:47 +02:00
d2bc4da15b
ffmpeg: purge redundant AVInputStream.index.
...
AVStream.index stores the same thing.
2011-05-25 15:55:47 +02:00
a121754852
ffmpeg: Don't trigger url_interrupt_cb on the first signal
...
Currently, the url_interrupt_cb callback will abort all IO
after the first received signal. This makes the output files
from e.g. the mov muxer to be unreadable if the transcode is
aborted with ctrl+c.
After this patch, the first signal cleanly breaks out of
the transcoding loop, but won't forcibly abort all IO.
After the second signal is received, the url_interrupt_cb
callback will abort all IO.
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-05-22 22:06:20 +03:00
71cc331cab
ffmpeg: get rid of the -vglobal option.
...
It's badly documented and does the same thing as -flags global_header,
so it's redundant.
2011-05-21 21:25:58 +02:00
bc778a0cea
Add support for request_sample_format in ffmpeg and ffplay.
2011-05-18 17:27:06 -04:00
901ff51116
ffmpeg: fix -aspect cli option
...
Redesign the way -aspect option is handled. This is done by making
ffmpeg read the sample aspect ratio set in the corresponding input
stream by default, and overriding it using the value specified by
-aspect.
If the output display aspect ratio is specified with -aspect, it is
set at the end of the filterchain, thus overriding the value set by
filters in the filterchain.
This implementation is more robust, since does not modify the
filterchain description (which was creating potential syntax errors).
(Cherry-pick abf8342aa9e7c7b0d000
2011-05-16 14:13:03 -07:00
9d5fa6182d
Restructure video filter implementation in ffmpeg.c.
...
This fixes several bugs like multiple outputs and -aspect mixed with -vf
(cherry picked from commit 1762d9ced75c20c81bfaa7844c580d
2011-05-16 14:13:03 -07:00
Stefano Sabatini
Mans Rullgard
Martin Storsjö
Anton Khirnov
Diego Biurrun
Justin Ruggles
Ronald S. Bultje
Alex Converse
Mike Williams
Baptiste Coudurier
Michael Niedermayer