Janne Grunau
aa38cff2c6
avconv: fix segfault at EOF with delayed pictures
...
At EOF it makes no sense to modify avpkt.{data,size} in output_packet
since no data is consumed. Frame threading with more than 1 threads
hits the segfault.
13 years ago
Anton Khirnov
06d4e2fa5a
avconv: remove a now unused parameter from output_packet().
13 years ago
Anton Khirnov
8b0268a853
avconv: formatting fixes in output_packet()
13 years ago
Anton Khirnov
ffa0674e5a
avconv: declare some variables in blocks where they are used
13 years ago
Anton Khirnov
af8ad892bf
avconv: use the same behavior when decoding audio/video/subs
...
I.e. if the packet was only partially consumed, pass the rest of it into
the decoder again.
Also simplify the code so it's the same for video/audio/subs.
13 years ago
Anton Khirnov
e1edfbcb24
avconv: use vsync 0 for AVFMT_NOTIMESTAMPS formats.
...
Prevent avconv from duplicating or dropping frames for formats where it
makes even less sense than usual, e.g. image2.
13 years ago
Alex Converse
105ab61c5f
avconv: Consistently use PIX_FMT_NONE.
...
Use PIX_FMT_NONE instead of -1 when dealing with PixelFormat variables.
13 years ago
Anton Khirnov
82963f8f04
avconv: cleanup the transcoding loop in output_packet().
13 years ago
Anton Khirnov
9595234c94
avconv: split subtitle transcoding out of output_packet().
13 years ago
Anton Khirnov
45d4b66f6f
avconv: split video transcoding out of output_packet().
13 years ago
Anton Khirnov
ded28ba35b
avconv: split audio transcoding out of output_packet().
13 years ago
Anton Khirnov
78162b4ea2
avconv: reindent.
13 years ago
Anton Khirnov
2a651b719c
avconv: move streamcopy-only code out of decoding loop.
13 years ago
Anton Khirnov
51aeb69452
avconv: remove an always true condition and reindent.
13 years ago
Anton Khirnov
7204ec1a88
avconv: split off streamcopy handling into a separate loop.
...
This is easier to understand and is less likely to break horribly when a
stream is to be both decoded and copied.
13 years ago
Anton Khirnov
03f30c837b
avconv: cosmetics, reformat transcode_init()
...
Fix spacing, vertically align, break some long lines, add some empty
lines for readability.
13 years ago
Anton Khirnov
1bb77e51a8
avconv: rename 'os' variable to 'oc'
...
Output AVFormatContext is called 'oc' in most other places.
13 years ago
Michael Niedermayer
9b62241850
ffmpeg: 10l add back show_banner() that was lost in the last merge.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Martin Storsjö
2abe947ac0
avconv: Set new interrupt callbacks for all AVFormatContexts, use avio_open2() everywhere
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
13 years ago
Anton Khirnov
492cc1bef3
avconv: remove some codec-specific hacks
...
The problem they are supposed to fix is handled in riff.c, so those
hacks are pointless.
13 years ago
Anton Khirnov
059fb8c884
avconv: remove some redundant temporary variables.
13 years ago
Anton Khirnov
f8c314c81f
avconv: fix broken indentation
13 years ago
Anton Khirnov
a2aeeb2263
avconv: move copy_initial_nonkeyframes to the options context.
...
Also document it.
13 years ago
Anton Khirnov
9a414d8962
avconv: use file:stream instead of file.stream in log messages.
13 years ago
Martin Storsjö
776f2bb91a
Call avformat_network_init/deinit in the programs
...
Calling the init function will become mandatory at some later
point. By calling it, more heavy network init (such as SSL/TLS
library init) can be done once at startup, instead of implicitly
when used (which could lead to it being done a number of times).
Signed-off-by: Martin Storsjö <martin@martin.st>
13 years ago
Anton Khirnov
a2c0b830d5
avconv: add -dump_attachment option.
13 years ago
Anton Khirnov
4dbc6ceef5
avconv: add -attach option.
...
It allows attaching arbitrary files, e.g. fonts to Matroska files.
13 years ago
Anton Khirnov
e6674f685b
avconv: make negative mappings disable only streams from the specified file
13 years ago
Martin Storsjö
02170990fd
cmdutils: Rename read_file to cmdutils_read_file
...
This symbol name clashes with a symbol in gnutls, if linking
statically to that library.
Signed-off-by: Martin Storsjö <martin@martin.st>
13 years ago
Justin Ruggles
d0a196962a
g722dec: remove the use of lowres for half-rate decoding.
...
It is broken because an AVCodecContext can be opened/closed multiple
times, and sample_rate is getting divided by 2 each time that happens.
This removes the only use of lowres for audio.
13 years ago
Anton Khirnov
3d813e4c54
lavf: deprecate AVStream.stream_copy
...
It's only used in avconv, so it properly belongs to OutputStream struct
there.
13 years ago
Anton Khirnov
1b648c7cdb
avconc: split choose_codec() to choose_decoder/choose_encoder.
...
Prevents -c copy from working for input streams and allows to move
stream_copy variable from AVStream to OutputStream.
13 years ago
Anton Khirnov
f172132f82
mpegenc: add preload private option.
...
Deprecate AVFormatContext.preload.
13 years ago
Anton Khirnov
84ad31ff18
lavf: replace av_new_stream->avformat_new_stream part II.
...
Manual replacements are done in this commit.
In many cases, the id is some constant made up number (e.g. 0 for video
and 1 for audio), which is then not used in the demuxer for anything.
Those ids are removed.
13 years ago
Alexandra Khirnova
3ec344626c
avconv: add presets
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
13 years ago
Anton Khirnov
7a6cd9957d
cmdutils/avtools: simplify show_help() by using av_opt_child_class_next()
13 years ago
Anton Khirnov
3b3ea34655
Remove all uses of deprecated AVOptions API.
13 years ago
Mans Rullgard
8124d8ad66
avtools: add -v as alias for -loglevel
...
This saves a bit of typing.
Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years ago
Anton Khirnov
f5646a325b
avconv: always print stats with AV_LOG_INFO
...
It's now possible to disable printing stats during encoding with
-nostats, so there's no reason to print them differently depending on
whether it's last report or not.
13 years ago
Anton Khirnov
3460dd8acf
avconv: add -stats option to enable/disable printing encoding progress
13 years ago
Anton Khirnov
c6007065ed
avconv: in output_packet() don't set decoded_data_size for video.
...
It's only used for audio.
13 years ago
Anton Khirnov
515901fad2
avconv: remove pointless always true condition
13 years ago
Anton Khirnov
11fdb7e197
avconv: factorize common code in transcode_init()
13 years ago
Alex Converse
daf9890811
avconv: Reformat s16 volume adjustment.
13 years ago
Alex Converse
4bb0b31f76
avconv: Initialize return value for codec copy path.
13 years ago
Alex Converse
a9a033773a
avconv: Fix volume adjustment for non-s16 sample formats
13 years ago
Alex Converse
fe332cf5b9
avconv: Make samples void*.
...
Different sample formats are different sizes.
13 years ago
Alex Converse
af3c06b4db
avconv: Use the size of the decode sample format when allocating the audio samples buffer.
13 years ago
Anton Khirnov
d3c1d37a90
avconv: use different variables for decoded and filtered frame.
...
Makes the code less obfuscated and fixes encoding one video stream to
several outputs.
Also use avcodec_alloc_frame() instead of allocating AVFrame on stack.
Breaks me_threshold in avconv, as motion vectors aren't passed through
lavfi. They could be copied manually, but I don't think this misfeature
is useful enough to justify ugly hacks.
13 years ago
Anton Khirnov
3ccd15803b
avconv: add support for copying attachments.
13 years ago