ffmpeg.git
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 agoaf_format: prefer strtok_r() over strsep()
Stefano Sabatini [Tue, 16 Aug 2011 00:02:44 +0000 (02:02 +0200)]
af_format: prefer strtok_r() over strsep()

strsep() is not POSIX compliant, and thus not supported on some platform.
Fix compilation on Solaris.

8 years agolavfi: complain and exit for invalid named values in ff_parse_packing_format()
Stefano Sabatini [Mon, 15 Aug 2011 23:59:50 +0000 (01:59 +0200)]
lavfi: complain and exit for invalid named values in ff_parse_packing_format()

8 years agoavconv: fix uninitialized variable
Michael Niedermayer [Tue, 16 Aug 2011 10:18:37 +0000 (12:18 +0200)]
avconv: fix uninitialized variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomovenc: change AV_LOG_INFO to AV_LOG_WARNING for some warnings
Anton Khirnov [Thu, 11 Aug 2011 14:33:03 +0000 (16:33 +0200)]
movenc: change AV_LOG_INFO to AV_LOG_WARNING for some warnings

8 years agoavconv: remove a write-only variable
Anton Khirnov [Mon, 15 Aug 2011 16:26:56 +0000 (18:26 +0200)]
avconv: remove a write-only variable

8 years agoavconv: remove pointless parameter from new_*_stream().
Anton Khirnov [Sat, 13 Aug 2011 06:23:44 +0000 (08:23 +0200)]
avconv: remove pointless parameter from new_*_stream().

New streams are always added to the last output file.

8 years agoavconv: cosmetics, move code
Anton Khirnov [Sat, 13 Aug 2011 06:08:13 +0000 (08:08 +0200)]
avconv: cosmetics, move code

Move find_codec_or_die(), choose_codec(), new_output_stream() and
read_avserver_streams() below transcode() where they belong.

8 years agoavconv: cosmetics -- move copy_chapters().
Anton Khirnov [Sat, 13 Aug 2011 05:56:38 +0000 (07:56 +0200)]
avconv: cosmetics -- move copy_chapters().

It's only used in opt_output_file(), so move it right above
opt_output_file().

8 years agoavconv: cosmetics -- move parse_forced_key_frames().
Anton Khirnov [Sat, 13 Aug 2011 05:55:04 +0000 (07:55 +0200)]
avconv: cosmetics -- move parse_forced_key_frames().

parse_forced_key_frames() is only used in new_video_stream(), so move it
right above new_video_stream().

8 years agolavc: add audio flag to the 'b' option, deprecate 'ab'.
Anton Khirnov [Tue, 9 Aug 2011 11:56:36 +0000 (13:56 +0200)]
lavc: add audio flag to the 'b' option, deprecate 'ab'.

Its only reason for its existence was ffmpeg's inability to properly assign
AVOptions to streams. Now this is not a problem anymore, so 'ab' should
go.

8 years agoavconv: rename sameq to same_quant
Anton Khirnov [Tue, 9 Aug 2011 09:32:16 +0000 (11:32 +0200)]
avconv: rename sameq to same_quant

It's often mistakenly used as 'same quality', emphasize that it's not
true in the manual.

8 years agodoc/avconv: add forgotten end of chapter.
Anton Khirnov [Tue, 9 Aug 2011 09:05:04 +0000 (11:05 +0200)]
doc/avconv: add forgotten end of chapter.

8 years agoChangelog: document avconv incompatibilities with ffmpeg.
Anton Khirnov [Fri, 29 Jul 2011 12:17:01 +0000 (14:17 +0200)]
Changelog: document avconv incompatibilities with ffmpeg.

8 years agoavconv: replace -vcodec/-acodec/-scodec with a better system.
Anton Khirnov [Mon, 8 Aug 2011 12:29:37 +0000 (14:29 +0200)]
avconv: replace -vcodec/-acodec/-scodec with a better system.

The new option doesn't depend on its placement wrt -new* options (which
don't exist anymore) and works in a similar way as per-stream AVOptions.

-[vas]codec remain as aliases to -codec:[vas]

8 years agoavconv: remove presets.
Anton Khirnov [Fri, 12 Aug 2011 17:19:19 +0000 (19:19 +0200)]
avconv: remove presets.

Nothing except x264 uses them and native x264 presets should be used
with private options.

8 years agofate: more cases of avconv that should be conditional
Michael Niedermayer [Tue, 16 Aug 2011 01:38:00 +0000 (03:38 +0200)]
fate: more cases of avconv that should be conditional

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agofate: some shells parse $11 as ${1}1
Michael Niedermayer [Mon, 15 Aug 2011 22:29:09 +0000 (00:29 +0200)]
fate: some shells parse $11 as ${1}1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 15 Aug 2011 21:35:53 +0000 (23:35 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Fix NASM include directive
  dsputil_mmx: Honor HAVE_AMD3DNOW
  lavf,lavd: remove all usage of AVFormatParameters from demuxers.
  jack: add 'channels' private option.
  VC-1: fix reading of custom PAR.
  Remove redundant and dubious video codec detection by its extradata
  mpeg12: remove repeat-field code disabled since May 2002
  patch checklist: suggest fate instead of regression tests
  Turn on resampling on sudden size change instead of bailing out during recode.
  avtools: reinitialise filter chain when input video stream changes dimensions

Conflicts:
Makefile
avconv.c
doc/developer.texi
ffplay.c
libavcodec/x86/dsputil_mmx.c
libavdevice/libdc1394.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agofate: allow specifying the tool to use for fate (avconv / ffmpeg)
Michael Niedermayer [Mon, 15 Aug 2011 21:11:46 +0000 (23:11 +0200)]
fate: allow specifying the tool to use for fate (avconv / ffmpeg)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoconfigure: fix datadir after avconv merge
Michael Niedermayer [Mon, 15 Aug 2011 20:36:13 +0000 (22:36 +0200)]
configure: fix datadir after avconv merge

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosvq3: propagate codec memory allocation failure in context init
Dustin Brody [Fri, 12 Aug 2011 16:05:46 +0000 (12:05 -0400)]
svq3: propagate codec memory allocation failure in context init

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoFix NASM include directive
Dave Yeo [Sun, 14 Aug 2011 18:46:18 +0000 (11:46 -0700)]
Fix NASM include directive

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agodsputil_mmx: Honor HAVE_AMD3DNOW
Alex Converse [Sun, 14 Aug 2011 03:02:37 +0000 (20:02 -0700)]
dsputil_mmx: Honor HAVE_AMD3DNOW

8 years agolavf,lavd: remove all usage of AVFormatParameters from demuxers.
Anton Khirnov [Sun, 17 Jul 2011 05:45:33 +0000 (07:45 +0200)]
lavf,lavd: remove all usage of AVFormatParameters from demuxers.

AVFormatParameters are converted into corresponding private options in
av_open_input_file/stream() compat wrappers, so accessing them from
demuxers is redundant.

8 years agojack: add 'channels' private option.
Anton Khirnov [Sun, 17 Jul 2011 06:08:57 +0000 (08:08 +0200)]
jack: add 'channels' private option.

Get rid of AVFormatParameters usage.

8 years agoVC-1: fix reading of custom PAR.
Reimar Döffinger [Sat, 13 Aug 2011 09:58:18 +0000 (11:58 +0200)]
VC-1: fix reading of custom PAR.

Custom PAR num/denum are in 1-256 range.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agoRemove redundant and dubious video codec detection by its extradata
Kostya Shishkov [Sun, 14 Aug 2011 18:02:26 +0000 (20:02 +0200)]
Remove redundant and dubious video codec detection by its extradata

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agompeg12: remove repeat-field code disabled since May 2002
Dustin Brody [Fri, 12 Aug 2011 05:30:20 +0000 (01:30 -0400)]
mpeg12: remove repeat-field code disabled since May 2002

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agopatch checklist: suggest fate instead of regression tests
Michael Niedermayer [Sat, 9 Apr 2011 10:50:03 +0000 (10:50 +0000)]
patch checklist: suggest fate instead of regression tests

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoTurn on resampling on sudden size change instead of bailing out during recode.
Kostya [Sat, 13 Aug 2011 16:44:21 +0000 (16:44 +0000)]
Turn on resampling on sudden size change instead of bailing out during recode.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoavtools: reinitialise filter chain when input video stream changes dimensions
Kostya [Sat, 13 Aug 2011 16:44:04 +0000 (16:44 +0000)]
avtools: reinitialise filter chain when input video stream changes dimensions

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoh264pred_init_arm: compile hotfix
Michael Niedermayer [Mon, 15 Aug 2011 04:14:02 +0000 (06:14 +0200)]
h264pred_init_arm: compile hotfix

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffplay: more precise audio clock based on current time
Marton Balint [Sun, 14 Aug 2011 18:21:25 +0000 (20:21 +0200)]
ffplay: more precise audio clock based on current time

Since SDL has no audio buffer fullness info, one can get a much precise audio
clock based on the last time of the audio callback and the elapsed time since.

To achieve this I introduced the audio_current_pts and audio_current_pts_drift
variables (similar to video_current_pts and video_current_pts_drift) and
calculate them in the end of the audio callback, when VideoState->audio_clock
is already updated. The reference time I use is from the start of the audio
callback, because this way the amount of time used for audio decoding is not
interfereing with calculation.

I also replaced the audio_write_get_buf_size function with a calculated
variable because when the audio frame decoding is in progress audio_buf_size
and audio_buf_index are not stable, so using them from other threads are not a
good idea.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoaf_aformat: hotfix compile due to strsep()
Michael Niedermayer [Mon, 15 Aug 2011 01:35:25 +0000 (03:35 +0200)]
af_aformat: hotfix compile due to strsep()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agofate-rsync: switch to our server in preparation of h264 4:2:2 tests
Michael Niedermayer [Sun, 14 Aug 2011 22:41:23 +0000 (00:41 +0200)]
fate-rsync: switch to our server in preparation of h264 4:2:2 tests

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomxf: H.264/MPEG-4 AVC Intra support
Baptiste Coudurier [Sun, 14 Aug 2011 22:40:54 +0000 (00:40 +0200)]
mxf: H.264/MPEG-4 AVC Intra support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoh264dec: h264: 4:2:2 intra decoding
Baptiste Coudurier [Sun, 14 Aug 2011 22:39:55 +0000 (00:39 +0200)]
h264dec: h264: 4:2:2 intra decoding

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodsputil_mmx: fix indention
Baptiste Coudurier [Sun, 14 Aug 2011 22:37:19 +0000 (00:37 +0200)]
dsputil_mmx: fix indention

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agompegvideo: Fix vshift vs hshift typo
Baptiste Coudurier [Sun, 14 Aug 2011 22:34:41 +0000 (00:34 +0200)]
mpegvideo: Fix vshift vs hshift typo

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 14 Aug 2011 17:49:04 +0000 (19:49 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  aacenc: Fix number of coefficients used in a LFE channel.
  aacenc: Fix a segfault with grouped psymodel.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosws: remove hScale16NX_c()
Michael Niedermayer [Sun, 14 Aug 2011 17:19:45 +0000 (19:19 +0200)]
sws: remove hScale16NX_c()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosws: remove hScale16N() and use ronalds reformated version of it.
Michael Niedermayer [Sun, 14 Aug 2011 17:05:03 +0000 (19:05 +0200)]
sws: remove hScale16N() and use ronalds reformated version of it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosws: remove unneeded code from last merge
Michael Niedermayer [Sun, 14 Aug 2011 13:22:50 +0000 (15:22 +0200)]
sws: remove unneeded code from last merge

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovf_unsharp: set default chroma size value to 5x5
Stefano Sabatini [Sat, 13 Aug 2011 14:30:44 +0000 (16:30 +0200)]
vf_unsharp: set default chroma size value to 5x5

The previous default value 0x0 was not good, since it is not even
valid.

8 years agovf_unsharp: fix out-of-buffer read
Stefano Sabatini [Fri, 12 Aug 2011 06:42:35 +0000 (08:42 +0200)]
vf_unsharp: fix out-of-buffer read

In apply_unsharp(), when y is >= height, prevent out-of-buffer reading
from src, read from the last buffer line in src2 instead.

The check was implemented in the original unsharp libmpcodecs code and
lost in the port.

This also fixes output discrepancy between the two filters.

8 years agolavfi: remove delogo mp wrapper
Stefano Sabatini [Sun, 14 Aug 2011 10:04:23 +0000 (12:04 +0200)]
lavfi: remove delogo mp wrapper

The delogo filter has been natively integrated into libavfilter,
simplify.

8 years agolavfi: port libmpcodecs delogo filter
Stefano Sabatini [Wed, 10 Aug 2011 16:58:49 +0000 (18:58 +0200)]
lavfi: port libmpcodecs delogo filter

The ported filter supports named option parsing and more YUV formats.

8 years agolavfi: add aformat filter
Mina Nagy Zaki [Thu, 14 Jul 2011 11:18:13 +0000 (14:18 +0300)]
lavfi: add aformat filter

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
8 years agolavfi: add internal functions for parsing format arguments
Mina Nagy Zaki [Thu, 4 Aug 2011 09:28:14 +0000 (12:28 +0300)]
lavfi: add internal functions for parsing format arguments

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
8 years agoaacenc: Fix number of coefficients used in a LFE channel.
Nathan Caldwell [Fri, 29 Jul 2011 20:49:04 +0000 (14:49 -0600)]
aacenc: Fix number of coefficients used in a LFE channel.

The spec states:

 *  Only the lowest 12 spectral coefficients of any LFE may be non-zero

We were using the 12 lowest *bands*.

8 years agoaacenc: Fix a segfault with grouped psymodel.
Nathan Caldwell [Sat, 23 Jul 2011 07:19:34 +0000 (01:19 -0600)]
aacenc: Fix a segfault with grouped psymodel.

10l: Forgot about TYPE_LFE being after TYPE_CPE. Which causes a
segfault when encoding 5.1

8 years agovsink_buffer: make the buffer cache all the incoming frames
Stefano Sabatini [Wed, 29 Jun 2011 15:31:16 +0000 (17:31 +0200)]
vsink_buffer: make the buffer cache all the incoming frames

Allow to cache more than one frame (e.g. for filters which return
more than one frame when avfilter_request_frame() is called on them),
and do not discard previously cached frames when a new one is added.

8 years agofifo: return AVERROR(ENOMEM) rather -1 in av_fifo_realloc2()
Stefano Sabatini [Sat, 13 Aug 2011 17:11:05 +0000 (19:11 +0200)]
fifo: return AVERROR(ENOMEM) rather -1 in av_fifo_realloc2()

8 years agofifo: apply misc cosmetic fixes
Stefano Sabatini [Sat, 13 Aug 2011 17:10:05 +0000 (19:10 +0200)]
fifo: apply misc cosmetic fixes

8 years agofifo: add av_fifo_peek2(), and deprecate av_fifo_peek()
Stefano Sabatini [Sat, 13 Aug 2011 16:26:01 +0000 (18:26 +0200)]
fifo: add av_fifo_peek2(), and deprecate av_fifo_peek()

The new function provides a more flexible interface for peeking at a
FIFO buffer data.

8 years agolavdev/lavfi: correctly set the inout pad index when linking a filter to the output...
Stefano Sabatini [Sat, 13 Aug 2011 23:17:02 +0000 (01:17 +0200)]
lavdev/lavfi: correctly set the inout pad index when linking a filter to the output sink

In lavfi_read_header(), use the pad index designated in the inout for
linking an output to a sink, rather than always 0. Fix link creation
for filters with more than one output (e.g. the split filter).

8 years agoVC-1: fix reading of custom PAR.
Reimar Döffinger [Sat, 13 Aug 2011 09:58:18 +0000 (11:58 +0200)]
VC-1: fix reading of custom PAR.

Custom PAR num/denum are coded -1.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoSupport streaming .au files.
Reimar Döffinger [Sat, 13 Aug 2011 10:06:09 +0000 (12:06 +0200)]
Support streaming .au files.

FFmpeg writes data_size as AU_UNKNOWN_SIZE, make demuxer not
fail when data_size is set to this value.
Should fix trac issue #394.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 13 Aug 2011 20:23:40 +0000 (22:23 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  swscale: add dithering to yuv2yuvX_altivec_real
  rv34: free+allocate buffer instead of reallocating it to preserve alignment
  h264: add missing brackets.
  swscale: use 15-bit intermediates for 9/10-bit scaling.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodv: honor timecode in DV muxer.
Clément Bœsch [Wed, 6 Jul 2011 13:08:28 +0000 (15:08 +0200)]
dv: honor timecode in DV muxer.

This is based on the original work by Baptiste Coudurier.

8 years agomxf: honor timecode drop flag in mxf muxer if set.
Clément Bœsch [Tue, 26 Jul 2011 09:31:00 +0000 (11:31 +0200)]
mxf: honor timecode drop flag in mxf muxer if set.

8 years agomxf: add cli option in mxfenc to replace GOP timecode parsing.
Clément Bœsch [Wed, 6 Jul 2011 14:35:12 +0000 (16:35 +0200)]
mxf: add cli option in mxfenc to replace GOP timecode parsing.

This is based on the original work by Baptiste Coudurier.

8 years agomxf: move framenum to timecode convert to timecode helpers.
Clément Bœsch [Wed, 6 Jul 2011 13:04:26 +0000 (15:04 +0200)]
mxf: move framenum to timecode convert to timecode helpers.

This is based on the original work by Baptiste Coudurier.

8 years agovf_unsharp: fix copy&paste error in chroma_amount param docs
Robert Krüger [Sat, 13 Aug 2011 14:41:07 +0000 (16:41 +0200)]
vf_unsharp: fix copy&paste error in chroma_amount param docs

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
8 years agovf_unsharp: vertically align lines, for better readability
Stefano Sabatini [Fri, 12 Aug 2011 22:41:17 +0000 (00:41 +0200)]
vf_unsharp: vertically align lines, for better readability

8 years agovf_unsharp: store hsub/vsub in the filter context
Stefano Sabatini [Fri, 12 Aug 2011 07:30:17 +0000 (09:30 +0200)]
vf_unsharp: store hsub/vsub in the filter context

Also drop obfuscating CHROMA_WIDTH/HEIGHT macros.

8 years agovf_unsharp: adopt a more natural order of params in apply_unsharp()
Stefano Sabatini [Fri, 12 Aug 2011 07:22:31 +0000 (09:22 +0200)]
vf_unsharp: adopt a more natural order of params in apply_unsharp()

8 years agovf_unsharp: rename method "unsharpen" to "apply_unsharp"
Stefano Sabatini [Fri, 12 Aug 2011 06:47:09 +0000 (08:47 +0200)]
vf_unsharp: rename method "unsharpen" to "apply_unsharp"

More consistent with the original libmpcodecs code, and the name
"unsharpen" was confusing.

8 years agoffmpeg: fix null pointer segfault on solaris. (ticket381)
Michael Niedermayer [Sat, 13 Aug 2011 12:16:55 +0000 (14:16 +0200)]
ffmpeg: fix null pointer segfault on solaris. (ticket381)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoavconv: remove trailing whitespace
Michael Niedermayer [Sat, 13 Aug 2011 12:27:06 +0000 (14:27 +0200)]
avconv: remove trailing whitespace

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoset Release to 0.8.2.git. We are at 0.8.2 and a bit further.
Dominique Leuenberger [Fri, 12 Aug 2011 22:42:33 +0000 (00:42 +0200)]
set Release to 0.8.2.git. We are at 0.8.2 and a bit further.

8 years agomov: Set negative Sample_duration in STTS to 1
Thierry Foucu [Fri, 12 Aug 2011 23:27:59 +0000 (16:27 -0700)]
mov: Set negative Sample_duration in STTS to 1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodoc/avconv.texi: fixup a few ff/av references
Michael Niedermayer [Sat, 13 Aug 2011 01:31:12 +0000 (03:31 +0200)]
doc/avconv.texi: fixup a few ff/av references

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'
Michael Niedermayer [Sat, 13 Aug 2011 00:16:44 +0000 (02:16 +0200)]
Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'

* commit 'b2c087871dafc7d030b2d48457ddff597dfd4925':
  Move x86util.asm from libavcodec/ to libavutil/.
  Move x86inc.asm to libavutil/.
  APIchanges: note error_recognition in lavf
  lavf: add support for error_recognition, use it in avidec, and bump minor API version
  avconv: change semantics of -map
  avconv: get rid of new* options.
  cmdutils: allow precisely specifying a stream for AVOptions.
  configure: add missing CFLAGS to fix building on the HURD
  libx264: Include hint for possible values for configuring libx264
  cmdutils: allow ':'-separated modifiers in option names.
  avconv: make -map_metadata work consistently with the other options
  avconv: remove deprecated options.
  avconv: make -map_chapters accept only the input file index.
  Make a copy of ffmpeg under a new name -- avconv.
  ffmpeg: add a warning stating that the program is deprecated.
  Add weighted motion compensation for RV40 B-frames
  RV3/4: calculate B-frame motion weights once per frame
  Move RV3/4-specific DSP functions into their own context
  mjpeg: propagate decode errors from ff_mjpeg_decode_sos and ff_mjpeg_decode_dqt
  h264: notice memory allocation failure

Conflicts:
.gitignore
Makefile
cmdutils.c
configure
doc/ffplay.texi
doc/ffprobe.texi
doc/ffserver.texi
libavcodec/libx264.c
libavformat/avformat.h
libavformat/avidec.c
libavformat/version.h
tests/lavf-regression.sh
tests/lavfi-regression.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoac3dec: export center & suroundmix levels
Michael Niedermayer [Fri, 12 Aug 2011 22:55:11 +0000 (00:55 +0200)]
ac3dec: export center & suroundmix levels

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoav_get_string: search children too.
Michael Niedermayer [Fri, 12 Aug 2011 22:54:07 +0000 (00:54 +0200)]
av_get_string: search children too.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoav_get_number: also search children, this is more sane than not doing so.
Michael Niedermayer [Fri, 12 Aug 2011 22:49:04 +0000 (00:49 +0200)]
av_get_number: also search children, this is more sane than not doing so.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoopt_find: fix segfault
Michael Niedermayer [Fri, 12 Aug 2011 23:04:53 +0000 (01:04 +0200)]
opt_find: fix segfault

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswscale: add dithering to yuv2yuvX_altivec_real
Luca Barbato [Wed, 10 Aug 2011 00:16:26 +0000 (02:16 +0200)]
swscale: add dithering to yuv2yuvX_altivec_real

It just does that part in scalar form, I doubt using a vector store
over 2 array would speed it up particularly.

The function should be written to not use a scratch buffer.

8 years agorv34: free+allocate buffer instead of reallocating it to preserve alignment
Kostya Shishkov [Fri, 12 Aug 2011 19:50:28 +0000 (21:50 +0200)]
rv34: free+allocate buffer instead of reallocating it to preserve alignment

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoh264: add missing brackets.
Ronald S. Bultje [Fri, 12 Aug 2011 19:32:31 +0000 (12:32 -0700)]
h264: add missing brackets.

This caused failure of a few fate tests.

8 years agoswscale: use 15-bit intermediates for 9/10-bit scaling.
Ronald S. Bultje [Tue, 2 Aug 2011 22:42:35 +0000 (15:42 -0700)]
swscale: use 15-bit intermediates for 9/10-bit scaling.

8 years agoMove x86util.asm from libavcodec/ to libavutil/.
Ronald S. Bultje [Wed, 3 Aug 2011 16:48:08 +0000 (09:48 -0700)]
Move x86util.asm from libavcodec/ to libavutil/.

This allows using it in swscale also.

8 years agoMove x86inc.asm to libavutil/.
Ronald S. Bultje [Sun, 24 Jul 2011 01:36:35 +0000 (18:36 -0700)]
Move x86inc.asm to libavutil/.

This allows using it in libswscale/ also.

8 years agoAPIchanges: note error_recognition in lavf
Dustin Brody [Sat, 6 Aug 2011 05:42:35 +0000 (01:42 -0400)]
APIchanges: note error_recognition in lavf

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agolavf: add support for error_recognition, use it in avidec, and bump minor API version
Dustin Brody [Sat, 6 Aug 2011 04:42:34 +0000 (04:42 +0000)]
lavf: add support for error_recognition, use it in avidec, and bump minor API version

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoavconv: change semantics of -map
Anton Khirnov [Fri, 29 Jul 2011 13:21:51 +0000 (15:21 +0200)]
avconv: change semantics of -map

New syntax contains an optional stream type, allowing to refer to n-th
stream of specific type.

Omitting stream number now maps all streams of the given type.

8 years agoavconv: get rid of new* options.
Anton Khirnov [Fri, 29 Jul 2011 06:36:13 +0000 (08:36 +0200)]
avconv: get rid of new* options.

They are confusing, irregular and redundant -- -map already contains all
the information.  Stream maps can now be parsed in opt_output_file().

Add a more user-friendly default behavior in case no maps are present.

Breaks -programid for now, but it never worked properly anyway. A better
solution will be written soon.

8 years agocmdutils: allow precisely specifying a stream for AVOptions.
Anton Khirnov [Thu, 28 Jul 2011 14:47:38 +0000 (16:47 +0200)]
cmdutils: allow precisely specifying a stream for AVOptions.

8 years agoac3enc: drop common fixed/float encoder
Michael Niedermayer [Fri, 12 Aug 2011 14:15:54 +0000 (16:15 +0200)]
ac3enc: drop common fixed/float encoder
User applications should by now be able to support float encoders.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoconfigure: add missing CFLAGS to fix building on the HURD
Pino Toscano [Fri, 12 Aug 2011 12:11:21 +0000 (14:11 +0200)]
configure: add missing CFLAGS to fix building on the HURD

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
8 years agolibx264: Include hint for possible values for configuring libx264
Reinhard Tartler [Tue, 9 Aug 2011 12:44:12 +0000 (14:44 +0200)]
libx264: Include hint for possible values for configuring libx264

The output of the x264 commandline tool contains the most uptodate
description of the possible values for the -preset, -tune and -profile
options.

8 years agocmdutils: allow ':'-separated modifiers in option names.
Anton Khirnov [Fri, 29 Jul 2011 11:47:37 +0000 (13:47 +0200)]
cmdutils: allow ':'-separated modifiers in option names.

8 years agoavconv: make -map_metadata work consistently with the other options
Anton Khirnov [Fri, 29 Jul 2011 11:07:27 +0000 (13:07 +0200)]
avconv: make -map_metadata work consistently with the other options

Before, it took an input and output file index, now it only takes an
input file and applies to the next output file.

Stream/chapter/program specification is now part of the option name and
the delimiter was changed from ',' to ':' to be consistent with the
similar feature for AVOptions.

8 years agoavconv: remove deprecated options.
Anton Khirnov [Thu, 28 Jul 2011 10:57:24 +0000 (12:57 +0200)]
avconv: remove deprecated options.

8 years agoavconv: make -map_chapters accept only the input file index.
Anton Khirnov [Wed, 27 Jul 2011 19:39:12 +0000 (21:39 +0200)]
avconv: make -map_chapters accept only the input file index.

This is consistent with how all the other options work.