ffmpeg.git
8 years agoffplay: make step variable a member of the VideoState struct
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>
8 years agoUpdates avcodec_get_pix_fmt_loss to return maximum loss for an invalid destination...
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>
8 years agoroqvideodec: Improve checking of input buffer bounds.
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>
8 years agoMerge remote-tracking branch 'qatar/master'
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>
8 years agovsrc_testsrc: allow to set the sample aspect ratio
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.

8 years agolavdev/lavfi: set sample aspect ratio in the output stream/codec context
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

8 years agoStream-copying PureVoice into caf works fine.
Carl Eugen Hoyos [Sun, 21 Aug 2011 12:52:48 +0000 (14:52 +0200)]
Stream-copying PureVoice into caf works fine.

8 years agoWavPack demuxer: do not rely on index when timestamp is not in indexed range.
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>
8 years agoWavPack demuxer: store position of the first block in index.
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>
8 years agoWavPack decoder: implement flush function
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>
8 years agoasrc_abuffer: pass non-const string to strtok_r in init()
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

8 years agolavfi: add asrc_abuffer - audio buffer source
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>
8 years agoMerge remote-tracking branch 'qatar/master'
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>
8 years agolavdev/lavfi: specify pos in the output packets
Stefano Sabatini [Sat, 20 Aug 2011 12:30:41 +0000 (14:30 +0200)]
lavdev/lavfi: specify pos in the output packets

8 years agolavfi: add ashowinfo filter
Stefano Sabatini [Thu, 18 Aug 2011 16:19:55 +0000 (18:19 +0200)]
lavfi: add ashowinfo filter

Useful for debugging.

8 years agoAPIchanges: fix wrong major number for av_fifo_peek2() entry
Stefano Sabatini [Sat, 20 Aug 2011 11:41:02 +0000 (13:41 +0200)]
APIchanges: fix wrong major number for av_fifo_peek2() entry

8 years agoAPIchanges: fill some lavfi entries with the corresponding git hash
Stefano Sabatini [Sat, 20 Aug 2011 11:40:03 +0000 (13:40 +0200)]
APIchanges: fill some lavfi entries with the corresponding git hash

8 years agolavdev/lavfi: initialize variable, fix warning
Stefano Sabatini [Thu, 18 Aug 2011 12:28:42 +0000 (14:28 +0200)]
lavdev/lavfi: initialize variable, fix warning

8 years agoffprobe: use av_get_media_type_string() in media_type_string(), simplify
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

8 years agolavu: add av_get_media_type_string() convenience function
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.

8 years agoFix parser not to clobber has_b_frames when extradata is set.
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>
8 years agoavconv: Separate initialization from the main transcode loop.
Alex Converse [Fri, 19 Aug 2011 21:45:02 +0000 (14:45 -0700)]
avconv: Separate initialization from the main transcode loop.

8 years agoh264: fixup indention
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>
8 years agodoc/avconv: replace forgotten av by avconv.
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>
8 years agoavconv: reset input_ts_offset between files.
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>
8 years agodoc/avconv: extend -ss documentation.
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>
8 years agoavconv: call flush_encoders() from transcode() directly.
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>
8 years agoavconv: fix broken indentation.
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>
8 years agoavconv: rescue poor abused limit_filesize global.
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>
8 years agoAutodetect LOAS in transport streams.
Carl Eugen Hoyos [Fri, 19 Aug 2011 22:27:54 +0000 (00:27 +0200)]
Autodetect LOAS in transport streams.

Fixes ticket 365.

8 years agoAdd LOAS demuxer.
Carl Eugen Hoyos [Fri, 19 Aug 2011 22:27:38 +0000 (00:27 +0200)]
Add LOAS demuxer.

8 years agoMerge remote-tracking branch 'qatar/master'
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>
8 years agoavconv: Set error code before before jumping to fail.
Alex Converse [Fri, 19 Aug 2011 18:26:21 +0000 (11:26 -0700)]
avconv: Set error code before before jumping to fail.

8 years agoh264: fix PCM intra-coded blocks in monochrome case
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>
8 years agoMerge remote-tracking branch 'qatar/master'
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>
8 years agoh264: correct implicit weight table computation for long ref pics
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>
8 years agoh264: correct the check for invalid long term frame index in MMCO decode
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>
8 years agoMerge remote-tracking branch 'qatar/master'
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>
8 years agoxmv: Read the video packet data first, then swap its bytes
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>
8 years agoxmv: Remove superfluous zeroing of already zero'd data
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>
8 years agoxmv: Add some doxygen comments
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>
8 years agoxmv: Merge XMVAudioTrack into XMVAudioPacket
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>
8 years agoxmv: Make the various offset variables uint64_t
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>
8 years agoxmv: fix license header to match patch
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>
8 years agoAllow setting resolution in DPI for Tiff.
Carl Eugen Hoyos [Thu, 18 Aug 2011 21:17:51 +0000 (23:17 +0200)]
Allow setting resolution in DPI for Tiff.

8 years agoavconv: Fix spelling errors.
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>
8 years agoaac: Only set sample rate and object type from ADTS if output hasn't been configured.
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>
8 years agoaac: Set SBR and PS to unsignalled during headerless and ADTS initialization.
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>
8 years agoaac: Only output configure if audio was found.
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>
8 years agoavconv: save two levels of indentation in flush_encoders()
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>

8 years agoavconv: factor flushing encoders out of output_packet().
Anton Khirnov [Thu, 18 Aug 2011 06:55:29 +0000 (08:55 +0200)]
avconv: factor flushing encoders out of output_packet().

8 years agoavconv: factor out initializing input streams.
Anton Khirnov [Wed, 6 Jul 2011 06:49:07 +0000 (08:49 +0200)]
avconv: factor out initializing input streams.

8 years agoavconv: remove -intra option.
Anton Khirnov [Wed, 17 Aug 2011 17:26:49 +0000 (19:26 +0200)]
avconv: remove -intra option.

It's equivalent to -g 0.

8 years agoMerge remote-tracking branch 'qatar/master'
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>
8 years agoavconv: reset streamid_map between output files.
Anton Khirnov [Wed, 17 Aug 2011 17:11:54 +0000 (19:11 +0200)]
avconv: reset streamid_map between output files.

8 years agoavconv: make timer_start a local var in transcode().
Anton Khirnov [Wed, 17 Aug 2011 16:46:36 +0000 (18:46 +0200)]
avconv: make timer_start a local var in transcode().

8 years agoavconv: cosmetics, move OutputStream.
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.

8 years agoavconv: remove two unused macros.
Anton Khirnov [Wed, 17 Aug 2011 16:35:43 +0000 (18:35 +0200)]
avconv: remove two unused macros.

8 years agoh264: hide reference frame errors unless requested
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>
8 years agoswscale: split hScale() function pointer into h[cy]Scale().
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.

8 years agoMove clipd macros to x86util.asm.
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.

8 years agolavc: fix wrong example code in avcodec_find_best_pix_fmt() docs
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>
8 years agolavc: fix avcodec_find_best_pix_fmt() when there's more than 64 pixel formats
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>
8 years agomatroskadec: use correct compression parameters for current track CodecPrivate
Aurelien Jacobs [Wed, 17 Aug 2011 22:21:21 +0000 (00:21 +0200)]
matroskadec: use correct compression parameters for current track CodecPrivate

8 years agomsrle: correctly round linesize for < 8 bpp formats.
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>
8 years agoavconv: reindent.
Anton Khirnov [Wed, 17 Aug 2011 10:08:41 +0000 (12:08 +0200)]
avconv: reindent.

8 years agoavconv: rescue poor abused start_time global.
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.

8 years agoavconv: rescue poor abused recording_time global.
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.

8 years agoavconv: merge two loops in output_packet().
Anton Khirnov [Wed, 17 Aug 2011 12:09:22 +0000 (14:09 +0200)]
avconv: merge two loops in output_packet().

8 years agoavconv: fix broken indentation.
Anton Khirnov [Wed, 17 Aug 2011 09:33:30 +0000 (11:33 +0200)]
avconv: fix broken indentation.

8 years agoavconv: get rid of the arbitrary MAX_FILES limit.
Anton Khirnov [Wed, 17 Aug 2011 08:27:17 +0000 (10:27 +0200)]
avconv: get rid of the arbitrary MAX_FILES limit.

8 years agoavconv: get rid of the output_streams_for_file vs. ost_table schizophrenia
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.

8 years agoavconv: add a wrapper for output AVFormatContexts and merge output_opts into it
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

8 years agoavconv: make itsscale syntax consistent with other options.
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.

8 years agoavconv: factor out adding input streams.
Anton Khirnov [Tue, 5 Jul 2011 17:38:50 +0000 (19:38 +0200)]
avconv: factor out adding input streams.

8 years agoavconv: Factorize combining auto vsync with format.
Alex Converse [Wed, 17 Aug 2011 02:06:46 +0000 (19:06 -0700)]
avconv: Factorize combining auto vsync with format.

8 years agoavconv: Factorize video resampling.
Alex Converse [Wed, 17 Aug 2011 01:43:27 +0000 (18:43 -0700)]
avconv: Factorize video resampling.

8 years agoavconv: Don't unnecessarily convert ipts to a double.
Alex Converse [Tue, 16 Aug 2011 21:41:16 +0000 (14:41 -0700)]
avconv: Don't unnecessarily convert ipts to a double.

8 years agoffmpeg: remove unsed variable nopts
Diego Biurrun [Wed, 17 Aug 2011 13:35:42 +0000 (15:35 +0200)]
ffmpeg: remove unsed variable nopts

8 years agoRV3/4 parser: remove unused variable 'off'
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>
8 years agoadd XMV demuxer
Sven Hesse [Tue, 16 Aug 2011 19:26:45 +0000 (21:26 +0200)]
add XMV demuxer

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agormdec: parse FPS in RealMedia properly
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>
8 years agoUse parsers for RealVideo 3/4 to determine correct PTS
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>
8 years agormdec: correct DTS calculation in RealMedia container.
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>
8 years agorv10/20: tell decoder to use edge emulation
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>
8 years agoMerge remote-tracking branch 'qatar/master'
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>
8 years agoavconv: Correct Copyright statement.
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>
8 years agolavfi: add aresample filter
Mina Nagy Zaki [Wed, 17 Aug 2011 11:00:20 +0000 (13:00 +0200)]
lavfi: add aresample filter

Based on a patch by Stefano.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
8 years agoffprobe: in value_string(), do not print trailing space in case of no suffix
Stefano Sabatini [Tue, 16 Aug 2011 22:34:15 +0000 (00:34 +0200)]
ffprobe: in value_string(), do not print trailing space in case of no suffix

8 years agoffplay: do not erase the content of vfilters
Stefano Sabatini [Tue, 16 Aug 2011 22:18:06 +0000 (00:18 +0200)]
ffplay: do not erase the content of vfilters

This way the content of "vfilters" can be reused.

For example when the frame size changes, the filterchain is
reconfigured reusing again the vfilters value.

8 years agoffplay: increase log level of the message issued when the stream frame size changes
Stefano Sabatini [Tue, 16 Aug 2011 22:15:34 +0000 (00:15 +0200)]
ffplay: increase log level of the message issued when the stream frame size changes

Use av_log(AV_LOG_LEVEL...) rather than av_dlog, the log is useful
even for "normal" debugging, and consistent with what is done in
ffmpeg.

Also change the message to achieve better consistency with the
corresponding ffmpeg message.

8 years agoffplay: in input_config_props(), prefer "s" over unnecessary "c" temporary variable
Stefano Sabatini [Tue, 16 Aug 2011 15:34:50 +0000 (17:34 +0200)]
ffplay: in input_config_props(), prefer "s" over unnecessary "c" temporary variable

Sligthly improve readability, reduce redundancy.

8 years agoffplay: in input_config_props(), honour the SAR specified in the codec context
Stefano Sabatini [Tue, 16 Aug 2011 15:26:31 +0000 (17:26 +0200)]
ffplay: in input_config_props(), honour the SAR specified in the codec context

Use the value specified in the codec context for setting the
filterchain sample aspect ratio, when it is not specified in the
stream context.

Consistent with the ffmpeg behavior.

Fix trac issue #398.

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 16 Aug 2011 21:47:35 +0000 (23:47 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  movenc: change AV_LOG_INFO to AV_LOG_WARNING for some warnings
  avconv: remove a write-only variable
  avconv: remove pointless parameter from new_*_stream().
  avconv: cosmetics, move code
  avconv: cosmetics -- move copy_chapters().
  avconv: cosmetics -- move parse_forced_key_frames().
  lavc: add audio flag to the 'b' option, deprecate 'ab'.
  avconv: rename sameq to same_quant
  doc/avconv: add forgotten end of chapter.
  Changelog: document avconv incompatibilities with ffmpeg.
  avconv: replace -vcodec/-acodec/-scodec with a better system.
  avconv: remove presets.
  svq3: propagate codec memory allocation failure in context init

Conflicts:
Changelog
avconv.c
libavcodec/options.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFix compilation with --disable-avfilter.
Carl Eugen Hoyos [Tue, 16 Aug 2011 21:31:09 +0000 (23:31 +0200)]
Fix compilation with --disable-avfilter.

8 years agoFix VC-1 width/height handling.
Reimar Döffinger [Sat, 13 Aug 2011 09:32:10 +0000 (11:32 +0200)]
Fix VC-1 width/height handling.

avcodec_set_dimensions should be used for size changes to ensure
compatibility with future changes.
avctx->width/avctx->height may not be set to display-only dimensions.
Even more so since vc1dec.c would later set coded_width/height based
on this.
coded_width/coded_height should be used instead of width/height for
decoder setup.
This fixes playback of e.g. zz-mcr-nsqr.vc1 sample (containing
display width/height settings) in MPlayer and should fix a crash
with MPC: http://forum.doom9.org/showthread.php?t=162221.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoRevert "avconv: use stream copy by default when possible."
Anton Khirnov [Tue, 16 Aug 2011 18:59:14 +0000 (20:59 +0200)]
Revert "avconv: use stream copy by default when possible."

This reverts commit 4f4f33844a7369e5579912cc02f3c5376b1e6872.

This commit has some ugly corner cases and needs to be discussed
further.

8 years agoavconv: print stream copy information.
Anton Khirnov [Tue, 16 Aug 2011 04:58:52 +0000 (06:58 +0200)]
avconv: print stream copy information.

8 years agoavconv: use stream copy by default when possible.
Anton Khirnov [Sat, 13 Aug 2011 06:37:13 +0000 (08:37 +0200)]
avconv: use stream copy by default when possible.

8 years agomatroskaenc: vertical alignment.
Anton Khirnov [Tue, 16 Aug 2011 04:52:50 +0000 (06:52 +0200)]
matroskaenc: vertical alignment.