Aneesh Dogra
7636c8c6a3
avconv: K&R cosmetics
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
13 years ago
Anton Khirnov
04a14d4d25
avconv: avoid memcpy in vsrc_buffer when possible.
...
Decoding Sintel.2010.1080p.mkv with 4 threads on an i7 2600K goes from
260s to 244s.
13 years ago
Anton Khirnov
64dca32cdf
avconv: implement get_buffer()/release_buffer().
...
This will allow memcpy-free passing frames to lavfi.
13 years ago
Alex Converse
4bf3c8f226
mov: Don't stick the QuickTime field ordering atom in extradata.
...
The 'fiel' atoms can be found in H.264 tracks clobbering the extradata.
MJPEG supports non field based extradata, and this data should be
preserved when copying.
13 years ago
Michael Niedermayer
452406bd5b
ff*: Fix duplicatedly printed version info with -version
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Alexandra Khirnova
a7b5e841ff
avconv: support stream specifiers in -metadata and -map_metadata
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
13 years ago
Anton Khirnov
cd3716b9aa
Replace all uses of av_close_input_file() with avformat_close_input().
13 years ago
Janne Grunau
f6cf4be821
avconv: update -map option help text
13 years ago
Diego Biurrun
da9cea77e3
Fix a bunch of common typos.
13 years ago
Anton Khirnov
5bf6638022
avconv: drop code for special handling of avserver streams.
...
It's broken and doesn't work anyway.
This patch means that avconv will ignore encoding options from the ffm
file and will instead use whatever is provided on the commandline as for
normal output.
13 years ago
Michael Niedermayer
7c41995e00
ffmpeg: more exact comment about libavformat.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Luca Barbato
f75e3d25d0
avconv: remove unsubstantiated comment
...
All the currently supported OS-es manage to use return values
properly.
13 years ago
Justin Ruggles
9179f27c64
avconv: only allocate 1 AVFrame per input stream
...
This avoids allocating/freeing an AVFrame for each packet decode. It also
simplifies error handling in transcode_audio() and transcode_video().
13 years ago
Justin Ruggles
110d2af28e
avconv: fix memleaks due to not freeing the AVFrame for audio
13 years ago
Justin Ruggles
d1241ff3b2
avconv: use avcodec_decode_audio4() instead of avcodec_decode_audio3()
13 years ago
Mans Rullgard
150ddbc148
Do not memcpy raw video frames when using null muxer
...
Commit 035af99
made avconv always call an encoder when using the
null muxer. While useful for 2-pass encodes, it inadvertently
caused an extra memcpy of raw frames when decoding only.
This hack restores the old behaviour when only decoding while
allowing use of the null muxer with encoded streams as well.
Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years ago
Anton Khirnov
7bb3e62594
avconv: make copy_tb on by default.
...
I.e. on streamcopy set output codec timebase from input stream timebase
(as opposed to input codec timebase). This should be more sane, because
since the stream is not decoded, the input codec tb has no relation to
the timestamps of the copied packets.
13 years ago
Anton Khirnov
741a05a293
avconv: compute next_pts from input packet duration when possible.
13 years ago
Anton Khirnov
91b412e786
avconv: update InputStream.pts in the streamcopy case.
...
This was broken in 2a651b719c
.
13 years ago
Alex Converse
fdab793a46
avconv: Handle audio sync for non-S16 sample formats.
...
Also fix reporting of the number of samples added/dropped.
13 years ago
Michael Niedermayer
6d13499be0
cmdutils: pass AVCodec to filter_codec_opts()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Carl Eugen Hoyos
0a4f02117b
Add option -n to exit if output file exists.
13 years ago
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