ffmpeg.git
6 years agodoc: declare encoding for texi2html.
Nicolas George [Sun, 22 Jul 2012 10:29:22 +0000 (12:29 +0200)]
doc: declare encoding for texi2html.

It adds the following header to the HTML files:
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
which helps some browsers to display correctly the few non-ASCII
characters in the doc.

6 years agolavfi: add alphaextract and alphamerge filters
Steven Robertson [Wed, 11 Jul 2012 05:14:57 +0000 (22:14 -0700)]
lavfi: add alphaextract and alphamerge filters

These filters are designed for storing and transmitting video sequences
with alpha using higher-efficiency codecs such as x264 which don't
natively support an alpha channel. 'alphaextract' takes an input stream
with an alpha channel and returns a video containing just the alpha
component as a grayscale value; 'alphamerge' takes an RGB or YUV stream
and adds an alpha channel recovered from a second grayscale stream.

Signed-off-by: Steven Robertson <steven@strobe.cc>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agodoc/filter_design: fix a few typos
Stefano Sabatini [Sun, 22 Jul 2012 09:28:57 +0000 (11:28 +0200)]
doc/filter_design: fix a few typos

6 years agolavd/caca: create display *after* checking dither options
Stefano Sabatini [Sat, 21 Jul 2012 15:16:01 +0000 (17:16 +0200)]
lavd/caca: create display *after* checking dither options

Avoid fastidious creation and immediate destroy of the display in case
one of the dither options fails to be set.

Also add NULL checks in write_trailer(), which are now necessary since
the function can be called when not all the components have been
initialized.

6 years agolavd/caca: provide more meaningful feedback if fails to set a dither option
Stefano Sabatini [Sat, 21 Jul 2012 09:04:51 +0000 (11:04 +0200)]
lavd/caca: provide more meaningful feedback if fails to set a dither option

6 years agolavd/caca: rename "colors" option to "color"
Stefano Sabatini [Sat, 21 Jul 2012 09:02:50 +0000 (11:02 +0200)]
lavd/caca: rename "colors" option to "color"

More consistent with libcaca function names. Should not harm since the
device was added less than one day ago.

6 years agolavd/caca: sort arguments for -list_dither
Stefano Sabatini [Sat, 21 Jul 2012 08:45:09 +0000 (10:45 +0200)]
lavd/caca: sort arguments for -list_dither

6 years agolavd/caca: extend error message for -list_dither option
Stefano Sabatini [Sat, 21 Jul 2012 08:44:40 +0000 (10:44 +0200)]
lavd/caca: extend error message for -list_dither option

6 years agodoc/outdevs: extend documentation for caca -list* options
Stefano Sabatini [Sat, 21 Jul 2012 08:38:04 +0000 (10:38 +0200)]
doc/outdevs: extend documentation for caca -list* options

6 years agoFix yuv4mpeg parsing of 'mono16' files.
Steven Robertson [Sun, 22 Jul 2012 07:59:25 +0000 (09:59 +0200)]
Fix yuv4mpeg parsing of 'mono16' files.

'mono' came before 'mono16' in the list of colorspace alternatives,
causing files of the latter type to be parsed as the former.

6 years agoatrac3: switch to av_assert
Michael Niedermayer [Sun, 22 Jul 2012 03:23:27 +0000 (05:23 +0200)]
atrac3: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agokbdwin: switch to av_assert
Michael Niedermayer [Sun, 22 Jul 2012 03:18:01 +0000 (05:18 +0200)]
kbdwin: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 22 Jul 2012 03:01:09 +0000 (05:01 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: swscale: Place inline assembly code under appropriate #ifdefs
  rtsp: remove terminal comma in FF_RTP_FLAG_OPTS macro.
  configure: Remove redundant RTMPT/RTMPTS dependencies
  configure: add filtering of host cflags/ldflags
  configure: initialise all flag filters at the same place
  configure: add filtering of linker flags
  configure: name some variables more consistently
  configure: remove filter_cppflags
  configure: set icc_version where it is needed
  mpegenc: remove disabled code

Conflicts:
configure
libavformat/movenc.c
libswscale/x86/swscale_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotscc: employ more meaningful return values
Paul B Mahol [Sat, 21 Jul 2012 04:16:26 +0000 (04:16 +0000)]
tscc: employ more meaningful return values

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agopthread: mark lockless thread synchronization variables as volatile
Michael Niedermayer [Tue, 17 Jul 2012 14:10:49 +0000 (16:10 +0200)]
pthread: mark lockless thread synchronization variables as volatile

No speed difference was meassureable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86: swscale: Place inline assembly code under appropriate #ifdefs
Ronald S. Bultje [Sun, 15 Jul 2012 04:25:55 +0000 (21:25 -0700)]
x86: swscale: Place inline assembly code under appropriate #ifdefs

Fixes compilation for compilers that do not support gcc inline assembly.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 21 Jul 2012 20:19:19 +0000 (22:19 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavfi: unref AVFilterLink.out_buf in ff_end_frame().
  lavfi: unref AVFilterLink.cur_buf in ff_end_frame().
  vsrc_testsrc: avoid an unnecessary avfilter_ref_buffer().
  vf_slicify: clear AVFilterLink.cur_buf in start_frame().
  vf_settb: simplify start_frame().
  vf_fieldorder: don't give up its own reference to the output buffer.
  vf_pad: don't give up its own reference to the output buffer.
  vf_overlay: don't access a buffer reference that's been given away.
  vf_drawtext: don't give up its own reference to the input buffer.
  vf_gradfun: don't store two pointers to one AVFilterBufferRef.
  vf_delogo: don't store two pointers to one AVFilterBufferRef.
  vf_aspect: clear AVFilterLink.cur_buf in start_frame().
  lavfi: add avfilter_unref_bufferp()

Conflicts:
doc/APIchanges
libavfilter/avfilter.h
libavfilter/buffer.c
libavfilter/vf_aspect.c
libavfilter/vf_drawtext.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovf_overlay: prevent premature freeing of cur_buf
Michael Niedermayer [Sat, 21 Jul 2012 20:00:10 +0000 (22:00 +0200)]
vf_overlay: prevent premature freeing of cur_buf

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovf_overlay: use unref_bufferP()
Michael Niedermayer [Sat, 21 Jul 2012 19:59:46 +0000 (21:59 +0200)]
vf_overlay: use unref_bufferP()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosink_buffer: prevent prematurely freeing of cur_buf
Michael Niedermayer [Sat, 21 Jul 2012 19:39:11 +0000 (21:39 +0200)]
sink_buffer: prevent prematurely freeing of cur_buf

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovf_thumbnail: prevent premature freeing of ref
Michael Niedermayer [Sat, 21 Jul 2012 19:38:19 +0000 (21:38 +0200)]
vf_thumbnail: prevent premature freeing of ref

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovf_colormatrix: avoid using out_buf
Michael Niedermayer [Sat, 21 Jul 2012 19:35:05 +0000 (21:35 +0200)]
vf_colormatrix: avoid using out_buf

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortsp: remove terminal comma in FF_RTP_FLAG_OPTS macro.
Ronald S. Bultje [Sat, 21 Jul 2012 14:13:48 +0000 (14:13 +0000)]
rtsp: remove terminal comma in FF_RTP_FLAG_OPTS macro.

This makes usage of the macro look more natural when
used with array entries.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agozerocodec: fix direct rendering.
Reimar Döffinger [Sat, 21 Jul 2012 11:22:04 +0000 (13:22 +0200)]
zerocodec: fix direct rendering.

Set picture type before calling get_buffer.
This allows the DR application to make better decisions.
It also fixes a resource leak in case of missing reference frames
since it would call get_buffer but never release_buffer.
Also use FFSWAP to ensure that the AVFrame is properly initialized
in the next get_buffer (in particular that data[0] is NULL).

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
6 years agoconfigure: Remove redundant RTMPT/RTMPTS dependencies
Samuel Pitoiset [Thu, 19 Jul 2012 12:16:01 +0000 (14:16 +0200)]
configure: Remove redundant RTMPT/RTMPTS dependencies

The incompatibility with librtmp is already expressed in the ffrtmphttp
protocol dependency declaration, which both RTMPT and RTMPTS depend on.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoconfigure: add filtering of host cflags/ldflags
Mans Rullgard [Fri, 20 Jul 2012 12:48:13 +0000 (13:48 +0100)]
configure: add filtering of host cflags/ldflags

This is in preparation for supporting host compilers with
non-standard flags.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agolibopenjpegdec: set cp_reduce value only once
Paul B Mahol [Sat, 21 Jul 2012 16:12:04 +0000 (16:12 +0000)]
libopenjpegdec: set cp_reduce value only once

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoiff: pass context to av_log_ask_for_sample
Paul B Mahol [Sat, 21 Jul 2012 16:05:22 +0000 (16:05 +0000)]
iff: pass context to av_log_ask_for_sample

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoconfigure: initialise all flag filters at the same place
Mans Rullgard [Fri, 20 Jul 2012 11:20:23 +0000 (12:20 +0100)]
configure: initialise all flag filters at the same place

This is more consistent, and doing it earlier is harmless.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoconfigure: add filtering of linker flags
Mans Rullgard [Fri, 20 Jul 2012 02:06:49 +0000 (03:06 +0100)]
configure: add filtering of linker flags

This allows filtering of linker flags the same was as already
supported for CFLAGS.  The filter must be initialised to 'echo'
early since it is invoked by --extra-ldflags.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoconfigure: name some variables more consistently
Mans Rullgard [Fri, 20 Jul 2012 11:02:18 +0000 (12:02 +0100)]
configure: name some variables more consistently

Name variables pertaining to various types of flags with 'cflags' etc
as prefix instead of suffix.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoconfigure: remove filter_cppflags
Mans Rullgard [Fri, 20 Jul 2012 11:02:29 +0000 (12:02 +0100)]
configure: remove filter_cppflags

This is not used and the current design would not work properly
if mixing tools needing different filters.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoconfigure: set icc_version where it is needed
Mans Rullgard [Wed, 18 Jul 2012 19:40:38 +0000 (20:40 +0100)]
configure: set icc_version where it is needed

This variable is only used once, so setting it there is clearer.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agompegenc: remove disabled code
Diego Biurrun [Fri, 29 Jul 2011 10:01:37 +0000 (12:01 +0200)]
mpegenc: remove disabled code

6 years agoiff: remove dupe ID_ANNO definition
Paul B Mahol [Sat, 21 Jul 2012 10:30:12 +0000 (10:30 +0000)]
iff: remove dupe ID_ANNO definition

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agodoc/outdevs: fix @code{} syntax in caca device docs
Stefano Sabatini [Sat, 21 Jul 2012 08:17:02 +0000 (10:17 +0200)]
doc/outdevs: fix @code{} syntax in caca device docs

6 years agoChangelog: add entry for the caca device
Stefano Sabatini [Sat, 21 Jul 2012 08:15:44 +0000 (10:15 +0200)]
Changelog: add entry for the caca device

6 years agoalacdec: fix packed sample output with 5.1
Michael Niedermayer [Sat, 21 Jul 2012 04:39:01 +0000 (06:39 +0200)]
alacdec: fix packed sample output with 5.1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoriff: add G723_1 wav tag
Piotr Bandurski [Fri, 20 Jul 2012 22:45:34 +0000 (00:45 +0200)]
riff: add G723_1 wav tag

Reveiwed-by: compn <tempn@twmi.rr.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoac3dec: set decode_error_flags field in ac3 codec
Marton Balint [Fri, 20 Jul 2012 21:28:03 +0000 (23:28 +0200)]
ac3dec: set decode_error_flags field in ac3 codec

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec: add decode_error_flags field to AVFrame
Marton Balint [Fri, 20 Jul 2012 21:28:02 +0000 (23:28 +0200)]
avcodec: add decode_error_flags field to AVFrame

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibcaca output device
Paul B Mahol [Tue, 13 Mar 2012 21:45:46 +0000 (21:45 +0000)]
libcaca output device

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 21 Jul 2012 00:49:57 +0000 (02:49 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libopenjpeg: introduce lowres and lowqual private options
  FATE: add a test for flac cover art.
  cafdec: allow larger ALAC magic cookie
  alac: fix channel pointer assignment for 24 and 32-bit

Conflicts:
libavcodec/alac.c
libavcodec/libopenjpegdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotiertexseq: remove redundant string from log message
Paul B Mahol [Fri, 20 Jul 2012 19:44:26 +0000 (19:44 +0000)]
tiertexseq: remove redundant string from log message

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi: unref AVFilterLink.out_buf in ff_end_frame().
Anton Khirnov [Sat, 14 Jul 2012 15:09:43 +0000 (17:09 +0200)]
lavfi: unref AVFilterLink.out_buf in ff_end_frame().

This reduces code duplication and prevents stale pointers from remaining
on the link.

6 years agov4l2: remove call to v4l2_fd_open.
Nicolas George [Fri, 20 Jul 2012 08:55:59 +0000 (10:55 +0200)]
v4l2: remove call to v4l2_fd_open.

v4l2_fd_open is already called at the end of v4l2_open;
calling a second time leaks structures inside libv4l2.

Fix trac ticket #1560.

6 years agolavfi: unref AVFilterLink.cur_buf in ff_end_frame().
Anton Khirnov [Sat, 14 Jul 2012 15:09:43 +0000 (17:09 +0200)]
lavfi: unref AVFilterLink.cur_buf in ff_end_frame().

This reduces code duplication and prevents stale pointers from remaining
on the link.

6 years agovsrc_testsrc: avoid an unnecessary avfilter_ref_buffer().
Anton Khirnov [Sun, 15 Jul 2012 09:12:10 +0000 (11:12 +0200)]
vsrc_testsrc: avoid an unnecessary avfilter_ref_buffer().

6 years agovf_slicify: clear AVFilterLink.cur_buf in start_frame().
Anton Khirnov [Wed, 11 Jul 2012 07:58:43 +0000 (09:58 +0200)]
vf_slicify: clear AVFilterLink.cur_buf in start_frame().

The buffer is passed on to the next filter, so we shouldn't keep any
pointers to it.

6 years agovf_settb: simplify start_frame().
Anton Khirnov [Wed, 11 Jul 2012 09:00:48 +0000 (11:00 +0200)]
vf_settb: simplify start_frame().

Avoid pointless filter ref/unref. Just use the reference passed to
start_frame().

6 years agovf_fieldorder: don't give up its own reference to the output buffer.
Anton Khirnov [Sun, 8 Jul 2012 15:01:17 +0000 (17:01 +0200)]
vf_fieldorder: don't give up its own reference to the output buffer.

6 years agovf_pad: don't give up its own reference to the output buffer.
Anton Khirnov [Sun, 8 Jul 2012 15:01:17 +0000 (17:01 +0200)]
vf_pad: don't give up its own reference to the output buffer.

6 years agovf_overlay: don't access a buffer reference that's been given away.
Anton Khirnov [Sun, 8 Jul 2012 03:34:20 +0000 (05:34 +0200)]
vf_overlay: don't access a buffer reference that's been given away.

6 years agovf_drawtext: don't give up its own reference to the input buffer.
Anton Khirnov [Sun, 8 Jul 2012 02:20:22 +0000 (04:20 +0200)]
vf_drawtext: don't give up its own reference to the input buffer.

Directly forwarding the input buffer to the next filter means that
drawtext no longer owns any references to it and thus shouldn't refer to
it in any way.

6 years agovf_gradfun: don't store two pointers to one AVFilterBufferRef.
Anton Khirnov [Sun, 8 Jul 2012 02:07:05 +0000 (04:07 +0200)]
vf_gradfun: don't store two pointers to one AVFilterBufferRef.

6 years agovf_delogo: don't store two pointers to one AVFilterBufferRef.
Anton Khirnov [Sun, 8 Jul 2012 02:07:05 +0000 (04:07 +0200)]
vf_delogo: don't store two pointers to one AVFilterBufferRef.

6 years agovf_aspect: clear AVFilterLink.cur_buf in start_frame().
Anton Khirnov [Wed, 11 Jul 2012 07:58:43 +0000 (09:58 +0200)]
vf_aspect: clear AVFilterLink.cur_buf in start_frame().

The buffer is passed on to the next filter, so we shouldn't keep any
pointers to it.

6 years agolavfi: add avfilter_unref_bufferp()
Robert Nagy [Mon, 16 Apr 2012 06:17:25 +0000 (08:17 +0200)]
lavfi: add avfilter_unref_bufferp()

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agoexr: display warning if multiple compression attributes are found
Paul B Mahol [Thu, 19 Jul 2012 18:04:49 +0000 (18:04 +0000)]
exr: display warning if multiple compression attributes are found

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoexr: merge common code
Paul B Mahol [Thu, 19 Jul 2012 18:00:10 +0000 (18:00 +0000)]
exr: merge common code

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoexr: compression attribute is mandatory
Paul B Mahol [Thu, 19 Jul 2012 17:56:55 +0000 (17:56 +0000)]
exr: compression attribute is mandatory

Do not continue decoding if one is missing.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agocmdutils/alloc_buffer: fix typo
chinshou [Fri, 20 Jul 2012 14:42:29 +0000 (16:42 +0200)]
cmdutils/alloc_buffer: fix typo

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodnxhd: Fix 10-bit DNxHD quant matrices
Joseph Artsimovich [Fri, 20 Jul 2012 10:31:06 +0000 (11:31 +0100)]
dnxhd: Fix 10-bit DNxHD quant matrices

Convert them to zigzag order, as the rest of them are.

When I was adding support for 10-bit DNxHD, I just copy-pasted the
missing quant matrices from the spec. Now it turns out the existing
matrices in dnxhddata.c were in zigzag order. This resulted in wrong
quantization for 10-bit DNxHD. The attached patch fixes the problem by
converting 10-bit quant matrices to zigzag order.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoudp: fix compilation when HAVE_PTHREAD_CANCEL isnt defined
Michael Niedermayer [Fri, 20 Jul 2012 12:58:11 +0000 (14:58 +0200)]
udp: fix compilation when HAVE_PTHREAD_CANCEL isnt defined

This happens with for example mplayer.
Fixing it in ffmpeg allows new ffmpeg to be compiled with older mplayer
which would not be possible if the fix was just in mplayer.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoalac: drop packed sample output support with the next major bump
Michael Niedermayer [Fri, 20 Jul 2012 12:10:21 +0000 (14:10 +0200)]
alac: drop packed sample output support with the next major bump

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibopenjpeg: introduce lowres and lowqual private options
Luca Barbato [Wed, 18 Jul 2012 23:31:39 +0000 (01:31 +0200)]
libopenjpeg: introduce lowres and lowqual private options

OpenJPEG can decode in lower resolution or decode only a number
of enhancement layers.

6 years agolavfi: add FF_*LINK_IDX convenience macros.
Nicolas George [Thu, 19 Jul 2012 10:59:38 +0000 (12:59 +0200)]
lavfi: add  FF_*LINK_IDX convenience macros.

6 years agolavc: set best_effort_timestamp for audio too.
Nicolas George [Thu, 19 Jul 2012 09:26:47 +0000 (11:26 +0200)]
lavc: set best_effort_timestamp for audio too.

6 years agolavfi: make copy_buffer_ref common.
Nicolas George [Thu, 19 Jul 2012 09:14:04 +0000 (11:14 +0200)]
lavfi: make copy_buffer_ref common.

6 years agolavf: make cmdutils's check_stream_specifier public.
Nicolas George [Wed, 18 Jul 2012 09:41:13 +0000 (11:41 +0200)]
lavf: make cmdutils's check_stream_specifier public.

The new function is called avformat_match_stream_specifier()
and does not include logging the error message.

6 years agodoc/avtools-common-opts: fix a few typos in the "Stream specifiers" section
Stefano Sabatini [Fri, 20 Jul 2012 10:55:14 +0000 (12:55 +0200)]
doc/avtools-common-opts: fix a few typos in the "Stream specifiers" section

6 years agofaq: explain dependency problems with static libs.
Nicolas George [Wed, 11 Jul 2012 10:01:19 +0000 (12:01 +0200)]
faq: explain dependency problems with static libs.

6 years agomatroska: add support for Opus.
Nicolas George [Wed, 4 Jul 2012 14:36:56 +0000 (16:36 +0200)]
matroska: add support for Opus.

Opus in Matroska is still a draft.

6 years agolavc: Opus decoder using libopus.
Nicolas George [Sun, 24 Jun 2012 09:39:05 +0000 (11:39 +0200)]
lavc: Opus decoder using libopus.

6 years agooggdec: add support for Opus codec.
Nicolas George [Sun, 24 Jun 2012 09:38:18 +0000 (11:38 +0200)]
oggdec: add support for Opus codec.

This patch also introduces CODEC_ID_OPUS.

6 years agoffmpeg: probe buffersinks once more after EOF.
Nicolas George [Tue, 17 Jul 2012 16:02:33 +0000 (18:02 +0200)]
ffmpeg: probe buffersinks once more after EOF.

Reap buffers stored in the buffer sinks even when
the avfilter_graph_request_oldest() loop only returns EOF.

avfilter_graph_request_oldest() can cause frames to arrive
to the sinks even when it returns EOF.

6 years agoFATE: add a test for flac cover art.
Anton Khirnov [Wed, 4 Jul 2012 08:46:10 +0000 (10:46 +0200)]
FATE: add a test for flac cover art.

6 years agoalacdec: several players have problems with planar audio still thus temporary put...
Michael Niedermayer [Fri, 20 Jul 2012 02:48:25 +0000 (04:48 +0200)]
alacdec: several players have problems with planar audio still thus temporary put packed output back by default

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffplay: fix warning that i just mistakenly introduced
Michael Niedermayer [Fri, 20 Jul 2012 01:47:11 +0000 (03:47 +0200)]
ffplay: fix warning that i just mistakenly introduced

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffplay: fix planar audio
Michael Niedermayer [Fri, 20 Jul 2012 01:36:33 +0000 (03:36 +0200)]
ffplay: fix planar audio

This caused ALAC to fail since the last merge

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocafdec: allow larger ALAC magic cookie
Justin Ruggles [Thu, 19 Jul 2012 23:48:21 +0000 (19:48 -0400)]
cafdec: allow larger ALAC magic cookie

It already skips any extra bytes at the end, and apparently there are some
samples in the wild with larger 'kuki' chunks.

6 years agoalac: fix channel pointer assignment for 24 and 32-bit
Justin Ruggles [Thu, 19 Jul 2012 23:47:08 +0000 (19:47 -0400)]
alac: fix channel pointer assignment for 24 and 32-bit

Needs to be done separately for each element.

6 years agolavd/sdl: use verb in options help message
Stefano Sabatini [Thu, 19 Jul 2012 21:51:56 +0000 (23:51 +0200)]
lavd/sdl: use verb in options help message

An help message tells what an option does, not what its argument is.

6 years agolavf: count skipped samples for initial timestamps.
Nicolas George [Sun, 15 Jul 2012 15:38:28 +0000 (17:38 +0200)]
lavf: count skipped samples for initial timestamps.

If skip_samples is set and timestamps are synthesized using durations,
make them start at -skip_samples (rescaled) instead of 0,
so that the timestamp of the first undiscarded sample is 0.

6 years agolavc: update pkt_duration for skipped samples.
Nicolas George [Sun, 15 Jul 2012 14:24:59 +0000 (16:24 +0200)]
lavc: update pkt_duration for skipped samples.

Also: factor the the computation of the timestamp difference.

6 years agoRevert "ffmpeg: set pkt_timebase"
Nicolas George [Sun, 15 Jul 2012 14:09:01 +0000 (16:09 +0200)]
Revert "ffmpeg: set pkt_timebase"

This reverts commit 744bd8d08c18d68d92ead091c7e335b4b07459aa.

pkt_timebase is now set by av_codec_set_pkt_timebase.
If some demuxer set AVStream.time_base directly,
it need to be fixed. There is a warning to detect it.

6 years agolavf: set pkt_timebase at the same time as stream->time_base.
Nicolas George [Sun, 15 Jul 2012 14:04:44 +0000 (16:04 +0200)]
lavf: set pkt_timebase at the same time as stream->time_base.

6 years agolavc: warn when impossible to adjust timestamps for skipped samples.
Nicolas George [Sun, 15 Jul 2012 12:37:27 +0000 (14:37 +0200)]
lavc: warn when impossible to adjust timestamps for skipped samples.

It is likely to happen if pkt_timebase was not set.

6 years agolavc: add debug info about skipped samples.
Nicolas George [Sun, 15 Jul 2012 12:36:22 +0000 (14:36 +0200)]
lavc: add debug info about skipped samples.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 19 Jul 2012 21:31:04 +0000 (23:31 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (38 commits)
  alac: cosmetics: general pretty-printing and comment clean up
  alac: calculate buffer size outside the loop in allocate_buffers()
  alac: change some data types to plain int
  alac: cosmetics: rename some variables and function names
  alac: multi-channel decoding support
  alac: split element parsing into a separate function
  alac: support a read sample size of up to 32
  alac: output in planar sample format
  alac: add 32-bit decoding support
  alac: simplify channel interleaving
  alac: use AVPacket fields directly in alac_decode_frame()
  alac: fix check for valid max_samples_per_frame
  alac: use get_sbits() to read LPC coefficients instead of casting
  alac: move the current samples per frame to the ALACContext
  alac: avoid using a double-negative when checking if the frame is compressed
  alac: factor out output_size check in predictor_decompress_fir_adapt()
  alac: factor out loading of next decoded sample in LPC prediction
  alac: use index into buffer_out instead of incrementing the pointer
  alac: simplify lpc coefficient adaptation
  alac: reduce the number of local variables needed in lpc prediction
  ...

Conflicts:
libavcodec/alac.c
libavformat/cafdec.c
libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/udp: warn in case the circular_buffer_size or overrun_nonfatal options are not...
Stefano Sabatini [Wed, 18 Jul 2012 14:33:24 +0000 (16:33 +0200)]
lavf/udp: warn in case the circular_buffer_size or overrun_nonfatal options are not supported

They are only supported if pthread is available.

6 years agodoc/protocols: add a note regarding the circular RX UDP buffer
Stefano Sabatini [Wed, 18 Jul 2012 14:56:11 +0000 (16:56 +0200)]
doc/protocols: add a note regarding the circular RX UDP buffer

6 years agodoc/protocols: apply misc fixes to the UDP protocol section
Stefano Sabatini [Wed, 18 Jul 2012 14:13:51 +0000 (16:13 +0200)]
doc/protocols: apply misc fixes to the UDP protocol section

6 years agodoc/protocols: extend/clarify documentation for the buffer_size UDP option
Stefano Sabatini [Wed, 18 Jul 2012 16:38:01 +0000 (18:38 +0200)]
doc/protocols: extend/clarify documentation for the buffer_size UDP option

6 years agodoc/protocols: document "fifo_size" and "overrun_nonfatal" UDP options
Stefano Sabatini [Sun, 15 Jul 2012 18:56:08 +0000 (20:56 +0200)]
doc/protocols: document "fifo_size" and "overrun_nonfatal" UDP options

Address trac ticket #1511.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 19 Jul 2012 19:58:09 +0000 (21:58 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Print full compiler identification, not only version number
  flacdec: reverse lpc coeff order, simplify filter
  x86: dsputil: drop some unused CPU flag debug code

Conflicts:
cmdutils.c
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoalac: cosmetics: general pretty-printing and comment clean up
Justin Ruggles [Mon, 9 Jul 2012 21:02:42 +0000 (17:02 -0400)]
alac: cosmetics: general pretty-printing and comment clean up

6 years agoalac: calculate buffer size outside the loop in allocate_buffers()
Justin Ruggles [Mon, 9 Jul 2012 20:57:22 +0000 (16:57 -0400)]
alac: calculate buffer size outside the loop in allocate_buffers()

6 years agoalac: change some data types to plain int
Justin Ruggles [Mon, 9 Jul 2012 20:56:34 +0000 (16:56 -0400)]
alac: change some data types to plain int

6 years agoalac: cosmetics: rename some variables and function names
Justin Ruggles [Mon, 9 Jul 2012 20:52:19 +0000 (16:52 -0400)]
alac: cosmetics: rename some variables and function names