OSDN Git Service
Nicolas George [Wed, 17 Aug 2011 14:17:30 +0000 (16:17 +0200)]
flvenc: use avcodec_get_name to report unsupported codecs.
Nicolas George [Wed, 17 Aug 2011 13:46:15 +0000 (15:46 +0200)]
ffmpeg: use avcodec_get_name to report missing en/decoders.
Nicolas George [Wed, 17 Aug 2011 13:40:30 +0000 (15:40 +0200)]
lavc: use av_get_media_type_string and avcodec_get_name in avcodec_string.
Nicolas George [Wed, 17 Aug 2011 11:54:49 +0000 (13:54 +0200)]
lavc: add a table of all codecs names.
The table is automatically generated from the definition of enum CodecID in
avcodec.h and contains the name of all known codecs, even those for which no
encoder nor decoder exists or is enabled.
The table is queried using the avcodec_get_name function.
If CONFIG_SMALL is true, the table is not compiled in; the avcodec_get_name
looks for names in the list of available decoders and encoders.
Nicolas George [Sat, 20 Aug 2011 10:40:26 +0000 (12:40 +0200)]
ffmpeg: print the codecs names in the stream mapping.
Stefano Sabatini [Thu, 18 Aug 2011 10:53:18 +0000 (12:53 +0200)]
vsrc_movie: rename video movie specific callbacks, prefix them with "movie"
Stefano Sabatini [Thu, 18 Aug 2011 12:58:47 +0000 (14:58 +0200)]
asink_abuffer: extend ABufferSinkContext to make it accept lists of formats in input
This is required for the pending lavfi indev extension, also
consistent with the video buffer sink.
Stefano Sabatini [Thu, 18 Aug 2011 10:36:39 +0000 (12:36 +0200)]
vsrc_movie: create media agnostic movie init and uninit routines
Allow factorization for the pending work on the audio movie source.
Stefano Sabatini [Tue, 16 Aug 2011 14:54:04 +0000 (16:54 +0200)]
af_aformat: use evil ADD_FORMATS macro for cutting out duplicated code
Nicolas George [Tue, 16 Aug 2011 13:49:17 +0000 (15:49 +0200)]
ffmpeg: ignore forward gaps for subtitles streams.
Carl Eugen Hoyos [Mon, 22 Aug 2011 07:35:58 +0000 (09:35 +0200)]
Support more codecs when muxing caf.
Marton Balint [Sun, 21 Aug 2011 13:06:10 +0000 (15:06 +0200)]
ffplay: remove unnecessary if (cur_stream) checks
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Marton Balint [Sun, 21 Aug 2011 13:06:09 +0000 (15:06 +0200)]
ffplay: get rid of the global cur_stream variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Marton Balint [Sun, 21 Aug 2011 13:06:08 +0000 (15:06 +0200)]
ffplay: make step variable a member of the VideoState struct
Getting rid of globals are generally a good thing. The patch also makes
toggle_pause and step_to_next_frame use a function parameter instead of
the global cur_stream variable.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Matthew Einhorn [Sun, 21 Aug 2011 17:18:30 +0000 (13:18 -0400)]
Updates avcodec_get_pix_fmt_loss to return maximum loss for an invalid destination pixel format.
Signed-off-by: Matthew Einhorn <moiein2000@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Sat, 20 Aug 2011 11:13:01 +0000 (13:13 +0200)]
roqvideodec: Improve checking of input buffer bounds.
Fixes trac issue #408.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Michael Niedermayer [Sun, 21 Aug 2011 13:27:02 +0000 (15:27 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
WavPack demuxer: do not rely on index when timestamp is not in indexed range.
WavPack demuxer: store position of the first block in index.
WavPack decoder: implement flush function
avconv: Separate initialization from the main transcode loop.
Conflicts:
avconv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sun, 21 Aug 2011 13:12:40 +0000 (15:12 +0200)]
vsrc_testsrc: allow to set the sample aspect ratio
Add the sar option. Useful for debugging/testing purposes.
Stefano Sabatini [Sun, 21 Aug 2011 13:09:17 +0000 (15:09 +0200)]
lavdev/lavfi: set sample aspect ratio in the output stream/codec context
Carl Eugen Hoyos [Sun, 21 Aug 2011 12:52:48 +0000 (14:52 +0200)]
Stream-copying PureVoice into caf works fine.
Kostya Shishkov [Sat, 20 Aug 2011 11:11:14 +0000 (13:11 +0200)]
WavPack demuxer: do not rely on index when timestamp is not in indexed range.
This fixes the situation when there are not enough entries in the index
(e.g. on initial seek there's only one index entry in the index) and index
search returns just the last known entry. That causes seeking function just to
seek there instead of trying harder to get at the requested position.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Kostya Shishkov [Sat, 20 Aug 2011 16:14:58 +0000 (18:14 +0200)]
WavPack demuxer: store position of the first block in index.
Currently for multichannel audio position for the last block position is
stored in index (and used for seeking), which is obviously not correct.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Kostya Shishkov [Sat, 20 Aug 2011 16:14:44 +0000 (18:14 +0200)]
WavPack decoder: implement flush function
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Stefano Sabatini [Sun, 21 Aug 2011 09:38:30 +0000 (11:38 +0200)]
asrc_abuffer: pass non-const string to strtok_r in init()
Fix GCC warning:
asrc_abuffer.c: In function ‘init’:
asrc_abuffer.c:258: warning: passing argument 1 of ‘strtok_r’ discards qualifiers from pointer target type
Mina Nagy Zaki [Mon, 1 Aug 2011 08:33:26 +0000 (11:33 +0300)]
lavfi: add asrc_abuffer - audio buffer source
Originally based on code by Stefano Sabatini and S. N. Hemanth.
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Michael Niedermayer [Sat, 20 Aug 2011 13:43:53 +0000 (15:43 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc/avconv: replace forgotten av by avconv.
avconv: reset input_ts_offset between files.
doc/avconv: extend -ss documentation.
avconv: call flush_encoders() from transcode() directly.
avconv: fix broken indentation.
avconv: rescue poor abused limit_filesize global.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sat, 20 Aug 2011 12:30:41 +0000 (14:30 +0200)]
lavdev/lavfi: specify pos in the output packets
Stefano Sabatini [Thu, 18 Aug 2011 16:19:55 +0000 (18:19 +0200)]
lavfi: add ashowinfo filter
Useful for debugging.
Stefano Sabatini [Sat, 20 Aug 2011 11:41:02 +0000 (13:41 +0200)]
APIchanges: fix wrong major number for av_fifo_peek2() entry
Stefano Sabatini [Sat, 20 Aug 2011 11:40:03 +0000 (13:40 +0200)]
APIchanges: fill some lavfi entries with the corresponding git hash
Stefano Sabatini [Thu, 18 Aug 2011 12:28:42 +0000 (14:28 +0200)]
lavdev/lavfi: initialize variable, fix warning
Stefano Sabatini [Thu, 18 Aug 2011 10:29:37 +0000 (12:29 +0200)]
ffprobe: use av_get_media_type_string() in media_type_string(), simplify
Stefano Sabatini [Thu, 18 Aug 2011 10:27:44 +0000 (12:27 +0200)]
lavu: add av_get_media_type_string() convenience function
Avoid code duplication.
Reimar Döffinger [Fri, 19 Aug 2011 20:38:34 +0000 (22:38 +0200)]
Fix parser not to clobber has_b_frames when extradata is set.
Due to it in contrast to the decoder not setting up low_delay,
the code in parse_nal_units would always end up setting has_b_frames
to 1 (except when stream is explicitly marked as low delay).
Since the parser itself would create extradata, simply reopening
the parser would cause this.
estimate_timings_from_pts would cause the parser to be reopened
on the same stream.
This fixes trac issue #360.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Alex Converse [Fri, 19 Aug 2011 21:45:02 +0000 (14:45 -0700)]
avconv: Separate initialization from the main transcode loop.
Michael Niedermayer [Fri, 19 Aug 2011 21:44:40 +0000 (23:44 +0200)]
h264: fixup indention
issue spoted in last merge (probably indention fixed there by diego)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Fri, 19 Aug 2011 15:52:49 +0000 (17:52 +0200)]
doc/avconv: replace forgotten av by avconv.
Signed-off-by: Alex Converse <alex.converse@gmail.com>
Anton Khirnov [Fri, 19 Aug 2011 15:52:48 +0000 (17:52 +0200)]
avconv: reset input_ts_offset between files.
Signed-off-by: Alex Converse <alex.converse@gmail.com>
Anton Khirnov [Fri, 19 Aug 2011 15:52:47 +0000 (17:52 +0200)]
doc/avconv: extend -ss documentation.
Signed-off-by: Alex Converse <alex.converse@gmail.com>
Anton Khirnov [Fri, 19 Aug 2011 15:52:46 +0000 (17:52 +0200)]
avconv: call flush_encoders() from transcode() directly.
And remove now pointless parameter.
Signed-off-by: Alex Converse <alex.converse@gmail.com>
Anton Khirnov [Fri, 19 Aug 2011 15:52:45 +0000 (17:52 +0200)]
avconv: fix broken indentation.
Signed-off-by: Alex Converse <alex.converse@gmail.com>
Anton Khirnov [Fri, 19 Aug 2011 15:52:44 +0000 (17:52 +0200)]
avconv: rescue poor abused limit_filesize global.
Keep a per-OutputFile instance of it, thus making -fs work with multiple
output files.
Signed-off-by: Alex Converse <alex.converse@gmail.com>
Carl Eugen Hoyos [Fri, 19 Aug 2011 22:27:54 +0000 (00:27 +0200)]
Autodetect LOAS in transport streams.
Fixes ticket 365.
Carl Eugen Hoyos [Fri, 19 Aug 2011 22:27:38 +0000 (00:27 +0200)]
Add LOAS demuxer.
Michael Niedermayer [Fri, 19 Aug 2011 21:32:51 +0000 (23:32 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: Set error code before before jumping to fail.
h264: fix PCM intra-coded blocks in monochrome case
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Alex Converse [Fri, 19 Aug 2011 18:26:21 +0000 (11:26 -0700)]
avconv: Set error code before before jumping to fail.
Jeff Downs [Tue, 5 Jul 2011 17:20:06 +0000 (13:20 -0400)]
h264: fix PCM intra-coded blocks in monochrome case
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Fri, 19 Aug 2011 13:07:12 +0000 (15:07 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: correct implicit weight table computation for long ref pics
h264: correct the check for invalid long term frame index in MMCO decode
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Jeff Downs [Wed, 6 Jul 2011 15:54:36 +0000 (11:54 -0400)]
h264: correct implicit weight table computation for long ref pics
Correct computation of implicit weight tables when referencing pictures
that are marked for long reference.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Jeff Downs [Tue, 5 Jul 2011 18:21:54 +0000 (14:21 -0400)]
h264: correct the check for invalid long term frame index in MMCO decode
The current check on MMCO parameters prohibits a "max long term frame index
plus 1" of 16 (frame idx of 15) for the "set max long term frame index" MMCO.
Fix this off-by-one error to allow the full range of legal values.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Thu, 18 Aug 2011 22:53:42 +0000 (00:53 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: Fix spelling errors.
aac: Only set sample rate and object type from ADTS if output hasn't been configured.
aac: Set SBR and PS to unsignalled during headerless and ADTS initialization.
aac: Only output configure if audio was found.
avconv: save two levels of indentation in flush_encoders()
avconv: factor flushing encoders out of output_packet().
avconv: factor out initializing input streams.
avconv: remove -intra option.
avconv: reset streamid_map between output files.
avconv: make timer_start a local var in transcode().
avconv: cosmetics, move OutputStream.
avconv: remove two unused macros.
Conflicts:
avconv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Sven Hesse [Thu, 18 Aug 2011 17:23:52 +0000 (19:23 +0200)]
xmv: Read the video packet data first, then swap its bytes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Sven Hesse [Thu, 18 Aug 2011 17:03:28 +0000 (19:03 +0200)]
xmv: Remove superfluous zeroing of already zero'd data
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Sven Hesse [Thu, 18 Aug 2011 17:00:21 +0000 (19:00 +0200)]
xmv: Add some doxygen comments
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Sven Hesse [Thu, 18 Aug 2011 16:37:14 +0000 (18:37 +0200)]
xmv: Merge XMVAudioTrack into XMVAudioPacket
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Sven Hesse [Thu, 18 Aug 2011 16:22:40 +0000 (18:22 +0200)]
xmv: Make the various offset variables uint64_t
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 18 Aug 2011 14:50:22 +0000 (16:50 +0200)]
xmv: fix license header to match patch
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Thu, 18 Aug 2011 21:17:51 +0000 (23:17 +0200)]
Allow setting resolution in DPI for Tiff.
Alex Converse [Thu, 18 Aug 2011 19:09:17 +0000 (12:09 -0700)]
avconv: Fix spelling errors.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Alex Converse [Tue, 16 Aug 2011 18:04:03 +0000 (11:04 -0700)]
aac: Only set sample rate and object type from ADTS if output hasn't been configured.
Long term it would be nice to support error resilient reconfiguration
but right now setting this every frame does more harm than help.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Alex Converse [Wed, 10 Aug 2011 23:37:32 +0000 (16:37 -0700)]
aac: Set SBR and PS to unsignalled during headerless and ADTS initialization.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Alex Converse [Tue, 16 Aug 2011 18:03:26 +0000 (11:03 -0700)]
aac: Only output configure if audio was found.
Audio found is not triggered on a CCE because a CCE alone has no output.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Anton Khirnov [Tue, 16 Aug 2011 09:19:20 +0000 (11:19 +0200)]
avconv: save two levels of indentation in flush_encoders()
By replacing
if (foo)
<do stuff>
with
if (!foo)
continue;
<do stuff>
Anton Khirnov [Thu, 18 Aug 2011 06:55:29 +0000 (08:55 +0200)]
avconv: factor flushing encoders out of output_packet().
Anton Khirnov [Wed, 6 Jul 2011 06:49:07 +0000 (08:49 +0200)]
avconv: factor out initializing input streams.
Anton Khirnov [Wed, 17 Aug 2011 17:26:49 +0000 (19:26 +0200)]
avconv: remove -intra option.
It's equivalent to -g 0.
Michael Niedermayer [Thu, 18 Aug 2011 08:20:25 +0000 (10:20 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master: (23 commits)
h264: hide reference frame errors unless requested
swscale: split hScale() function pointer into h[cy]Scale().
Move clipd macros to x86util.asm.
avconv: reindent.
avconv: rescue poor abused start_time global.
avconv: rescue poor abused recording_time global.
avconv: merge two loops in output_packet().
avconv: fix broken indentation.
avconv: get rid of the arbitrary MAX_FILES limit.
avconv: get rid of the output_streams_for_file vs. ost_table schizophrenia
avconv: add a wrapper for output AVFormatContexts and merge output_opts into it
avconv: make itsscale syntax consistent with other options.
avconv: factor out adding input streams.
avconv: Factorize combining auto vsync with format.
avconv: Factorize video resampling.
avconv: Don't unnecessarily convert ipts to a double.
ffmpeg: remove unsed variable nopts
RV3/4 parser: remove unused variable 'off'
add XMV demuxer
rmdec: parse FPS in RealMedia properly
...
Conflicts:
avconv.c
libavformat/version.h
libswscale/swscale.c
tests/ref/fate/lmlm4-demux
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Wed, 17 Aug 2011 17:11:54 +0000 (19:11 +0200)]
avconv: reset streamid_map between output files.
Anton Khirnov [Wed, 17 Aug 2011 16:46:36 +0000 (18:46 +0200)]
avconv: make timer_start a local var in transcode().
Anton Khirnov [Wed, 17 Aug 2011 16:40:40 +0000 (18:40 +0200)]
avconv: cosmetics, move OutputStream.
Allows us to get rid of forward InputStream declaration.
Anton Khirnov [Wed, 17 Aug 2011 16:35:43 +0000 (18:35 +0200)]
avconv: remove two unused macros.
Dustin Brody [Wed, 17 Aug 2011 22:08:09 +0000 (18:08 -0400)]
h264: hide reference frame errors unless requested
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Ronald S. Bultje [Wed, 3 Aug 2011 18:25:01 +0000 (11:25 -0700)]
swscale: split hScale() function pointer into h[cy]Scale().
This allows using more specific implementations for chroma/luma, e.g.
we can make assumptions on filterSize being constant, thus avoiding
that test at runtime.
Ronald S. Bultje [Wed, 17 Aug 2011 04:23:53 +0000 (21:23 -0700)]
Move clipd macros to x86util.asm.
This allows sharing them between multiple .asm files.
Matthew Einhorn [Wed, 17 Aug 2011 23:00:03 +0000 (01:00 +0200)]
lavc: fix wrong example code in avcodec_find_best_pix_fmt() docs
A pix_fmt_mask is obtained by bitwise or-ing two pixel format bits,
rather than doing a logical or.
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Matthew Einhorn [Wed, 17 Aug 2011 05:58:33 +0000 (01:58 -0400)]
lavc: fix avcodec_find_best_pix_fmt() when there's more than 64 pixel formats
This fixed the problem where if there's more than 64 pixel formats
defined avcodec_find_best_pix_fmt() returns the wrong pixel format.
Signed-off-by: Matthew Einhorn <moiein2000@gmail.com>
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Aurelien Jacobs [Wed, 17 Aug 2011 22:21:21 +0000 (00:21 +0200)]
matroskadec: use correct compression parameters for current track CodecPrivate
Reimar Döffinger [Tue, 16 Aug 2011 21:41:09 +0000 (23:41 +0200)]
msrle: correctly round linesize for < 8 bpp formats.
Fixes trac issue #338.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Anton Khirnov [Wed, 17 Aug 2011 10:08:41 +0000 (12:08 +0200)]
avconv: reindent.
Anton Khirnov [Wed, 17 Aug 2011 09:42:44 +0000 (11:42 +0200)]
avconv: rescue poor abused start_time global.
Keep a per-OutputFile instance of it, thus making -ss work with multiple
output files.
Anton Khirnov [Wed, 17 Aug 2011 09:42:44 +0000 (11:42 +0200)]
avconv: rescue poor abused recording_time global.
Keep a per-OutputFile instance of it, thus making -t work with multiple
output files.
Anton Khirnov [Wed, 17 Aug 2011 12:09:22 +0000 (14:09 +0200)]
avconv: merge two loops in output_packet().
Anton Khirnov [Wed, 17 Aug 2011 09:33:30 +0000 (11:33 +0200)]
avconv: fix broken indentation.
Anton Khirnov [Wed, 17 Aug 2011 08:27:17 +0000 (10:27 +0200)]
avconv: get rid of the arbitrary MAX_FILES limit.
Anton Khirnov [Wed, 17 Aug 2011 08:21:37 +0000 (10:21 +0200)]
avconv: get rid of the output_streams_for_file vs. ost_table schizophrenia
Instead store output streams in the same way as input streams.
Anton Khirnov [Wed, 17 Aug 2011 07:56:08 +0000 (09:56 +0200)]
avconv: add a wrapper for output AVFormatContexts and merge output_opts into it
Anton Khirnov [Wed, 17 Aug 2011 07:12:04 +0000 (09:12 +0200)]
avconv: make itsscale syntax consistent with other options.
Move the stream specifier to the option name.
Anton Khirnov [Tue, 5 Jul 2011 17:38:50 +0000 (19:38 +0200)]
avconv: factor out adding input streams.
Alex Converse [Wed, 17 Aug 2011 02:06:46 +0000 (19:06 -0700)]
avconv: Factorize combining auto vsync with format.
Alex Converse [Wed, 17 Aug 2011 01:43:27 +0000 (18:43 -0700)]
avconv: Factorize video resampling.
Alex Converse [Tue, 16 Aug 2011 21:41:16 +0000 (14:41 -0700)]
avconv: Don't unnecessarily convert ipts to a double.
Diego Biurrun [Wed, 17 Aug 2011 13:35:42 +0000 (15:35 +0200)]
ffmpeg: remove unsed variable nopts
Kostya Shishkov [Wed, 17 Aug 2011 13:07:49 +0000 (15:07 +0200)]
RV3/4 parser: remove unused variable 'off'
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Sven Hesse [Tue, 16 Aug 2011 19:26:45 +0000 (21:26 +0200)]
add XMV demuxer
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Kostya Shishkov [Tue, 16 Aug 2011 07:10:57 +0000 (09:10 +0200)]
rmdec: parse FPS in RealMedia properly
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Kostya Shishkov [Mon, 15 Aug 2011 10:03:40 +0000 (12:03 +0200)]
Use parsers for RealVideo 3/4 to determine correct PTS
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Kostya Shishkov [Thu, 11 Aug 2011 12:44:05 +0000 (14:44 +0200)]
rmdec: correct DTS calculation in RealMedia container.
First, container stores only DTS and not PTS as it was believed.
Second, multiple frames in a packet store timestamp instead of position
after the frame length.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Kostya Shishkov [Wed, 17 Aug 2011 08:36:33 +0000 (10:36 +0200)]
rv10/20: tell decoder to use edge emulation
This removes out-of-edge motion compensation artifacts (easily spotted green
blocks in avplay, gray blocks in transcoding), for example here:
http://samples.libav.org/samples/real/tv_watching_t1.rm
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Wed, 17 Aug 2011 12:23:20 +0000 (14:23 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Revert "avconv: use stream copy by default when possible."
avconv: print stream copy information.
avconv: use stream copy by default when possible.
matroskaenc: vertical alignment.
matroskaenc: implement query_codec()
lavf: add avformat_query_codec().
lavc: add avcodec_get_type() for mapping codec_id -> type.
flvenc: use int64_t to store offsets
avconv: don't segfault on 0 input files.
Do not write ID3v1 tags by default
mpegts: log into an AVFormatContext rather than MpegTSContext.
Conflicts:
doc/APIchanges
libavcodec/version.h
libavformat/avformat.h
libavformat/mp3enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 17 Aug 2011 12:00:25 +0000 (14:00 +0200)]
avconv: Correct Copyright statement.
this more than 4000 line file has less than 600 lines that are not in ffmpeg.c
and they are largely cosmetic changes from ffmpeg.c.
Thus the copyright statement from ffmpeg.c should be used.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>