ffmpeg.git
6 years agolavfi/kerndeint: use aligned linesizes for the temporary buffer.
Clément Bœsch [Sun, 6 Jan 2013 18:34:16 +0000 (19:34 +0100)]
lavfi/kerndeint: use aligned linesizes for the temporary buffer.

This improves the performances just enough to match mp=kerndeint.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agolavfi/unsharp: extend range for amount values, to reflect the behavior of mp=unsharp
Stefano Sabatini [Fri, 15 Feb 2013 13:06:05 +0000 (14:06 +0100)]
lavfi/unsharp: extend range for amount values, to reflect the behavior of mp=unsharp

Also update the documentation accordingly, and suggest a meaningful range.

6 years agodoc/filters: itemize unsharp examples
Stefano Sabatini [Fri, 15 Feb 2013 01:07:02 +0000 (02:07 +0100)]
doc/filters: itemize unsharp examples

Also drop pointless example.

6 years agolavfi/unsharp: use named options, and add missing checks on matrix size values
Stefano Sabatini [Fri, 12 Aug 2011 23:08:48 +0000 (01:08 +0200)]
lavfi/unsharp: use named options, and add missing checks on matrix size values

In particular, avoid out-of-buffer access and crashes with too big
values, and rework documentation accordingly.

6 years agosws/x86: improve rounding for yuv2yuvX
Michael Niedermayer [Fri, 15 Feb 2013 20:08:51 +0000 (21:08 +0100)]
sws/x86: improve rounding for yuv2yuvX

This tries to compensate for the errors introduced by
the rounding of pmulhw

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/kerndeint: use av_pix_fmt_desc_get instead of directly accessing the table
Hendrik Leppkes [Fri, 15 Feb 2013 14:53:54 +0000 (15:53 +0100)]
lavfi/kerndeint: use av_pix_fmt_desc_get instead of directly accessing the table

Fixes FATE in MSVC DLL builds.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc: fix reference to ffmpeg-bitstream-filters.html page
Stefano Sabatini [Fri, 15 Feb 2013 12:31:09 +0000 (13:31 +0100)]
doc: fix reference to ffmpeg-bitstream-filters.html page

6 years agolavfi/ebur128: advance pointer to samples
sedacca@comcast.net [Fri, 18 Jan 2013 05:14:01 +0000 (05:14 +0000)]
lavfi/ebur128: advance pointer to samples

Correct the advancement of a pointer to skip over LFE samples as
intended in the loudness computation.

This suggested patch is 3 of 3 for Ticket #2144 "libavfilter ebur128
loudness inaccuracy, irregular time interval, LFE interference".
This suggested patch supersedes the contribution of January 15, 2013
in the thread “[PATCH] lavfi: EBU R.128 irreg time, ch weights, skip
LFE” which combined multiple fixes in one batch.

6 years agolavfi/ebur128: fix channel weights
David A. Sedacca [Sat, 19 Jan 2013 20:24:53 +0000 (20:24 +0000)]
lavfi/ebur128: fix channel weights

Correct the recognition of channel layouts for good channel weight
in the loudness computation.
This suggested patch is 2 of 3 for Ticket #2144 "libavfilter ebur128
loudness inaccuracy, irregular time interval, LFE interference".

Signed-off-by: David A. Sedacca <sedacca at comcast.net>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 15 Feb 2013 11:27:44 +0000 (12:27 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  sparc: dsputil: Simplify high_bit_depth checks

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '49fe280753e0f167ac3d9f227f0c0f7744501fc1'
Michael Niedermayer [Fri, 15 Feb 2013 11:18:37 +0000 (12:18 +0100)]
Merge commit '49fe280753e0f167ac3d9f227f0c0f7744501fc1'

* commit '49fe280753e0f167ac3d9f227f0c0f7744501fc1':
  h264idct: Replace duplicate scan8 table by appropriate #include

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4db96649ca700db563d9da4ebe70bf9fc4c7a6ba'
Michael Niedermayer [Fri, 15 Feb 2013 11:10:08 +0000 (12:10 +0100)]
Merge commit '4db96649ca700db563d9da4ebe70bf9fc4c7a6ba'

* commit '4db96649ca700db563d9da4ebe70bf9fc4c7a6ba':
  avutil: Ensure that emms_c is always defined, even on non-x86
  configure: Move MinGW CPPFLAGS setting to libc section, where it belongs
  avutil: Move emms code to x86-specific header

Conflicts:
configure
libavutil/internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobuild: fixes a "can't cd to..." issue when installing shared libraries.
Cyrille Faucheux [Tue, 12 Feb 2013 16:23:31 +0000 (17:23 +0100)]
build: fixes a "can't cd to..." issue when installing shared libraries.

The problem is reproducible with a relative prefix path.

6 years agolavf: dont try to find fps for attached pictures
Michael Niedermayer [Fri, 15 Feb 2013 01:17:39 +0000 (02:17 +0100)]
lavf: dont try to find fps for attached pictures

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosparc: dsputil: Simplify high_bit_depth checks
Diego Biurrun [Fri, 15 Feb 2013 01:13:42 +0000 (02:13 +0100)]
sparc: dsputil: Simplify high_bit_depth checks

6 years agolavfi/unsharp: use the same macros used in the original MP filter
Stefano Sabatini [Fri, 12 Aug 2011 22:44:08 +0000 (00:44 +0200)]
lavfi/unsharp: use the same macros used in the original MP filter

Remove possibly pointless inconsistency with the ported code.

Also specify parameter value ranges consistent with those of the ported
filter.

6 years agoexamples/scaling_video: fix typo
Stefano Sabatini [Thu, 14 Feb 2013 23:26:04 +0000 (00:26 +0100)]
examples/scaling_video: fix typo

6 years agodoc/APIchanges: List merge commit hashes and version numbers
Michael Niedermayer [Wed, 13 Feb 2013 02:32:23 +0000 (03:32 +0100)]
doc/APIchanges: List merge commit hashes and version numbers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264idct: Replace duplicate scan8 table by appropriate #include
Diego Biurrun [Fri, 18 Jan 2013 22:00:18 +0000 (23:00 +0100)]
h264idct: Replace duplicate scan8 table by appropriate #include

6 years agodshow: Fix MSVC support, remove av_export, which was apparently unneeded anyway.
rogerdpack [Thu, 14 Feb 2013 19:00:30 +0000 (12:00 -0700)]
dshow: Fix MSVC support, remove av_export, which was apparently unneeded anyway.

Also cleanup exported symbols

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoRemoving network.h from matroskadec.c
Vignesh Venkatasubramanian [Thu, 14 Feb 2013 22:59:30 +0000 (14:59 -0800)]
Removing network.h from matroskadec.c

Removing accidentally added include file.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: Check for parameter changes at the output of the audio filter graph
Michael Niedermayer [Thu, 14 Feb 2013 22:43:34 +0000 (23:43 +0100)]
ffmpeg: Check for parameter changes at the output of the audio filter graph

It is currently possible that such changes leak through from the decoder as
well as a filter could generate such changes itself.
This commit blocks such changed packets unless the encoder declares support.

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoFix a few "its" vs "it's" typo.
Clément Bœsch [Thu, 14 Feb 2013 22:45:48 +0000 (23:45 +0100)]
Fix a few "its" vs "it's" typo.

6 years agodoc/resampler: fix two typo.
Clément Bœsch [Thu, 14 Feb 2013 22:43:08 +0000 (23:43 +0100)]
doc/resampler: fix two typo.

6 years agolavfi/showspectrum: simplify intensity_color_table declaration.
Clément Bœsch [Thu, 14 Feb 2013 22:10:01 +0000 (23:10 +0100)]
lavfi/showspectrum: simplify intensity_color_table declaration.

6 years agolavfi/showspectrum: pretty-align constants.
Clément Bœsch [Thu, 14 Feb 2013 22:04:15 +0000 (23:04 +0100)]
lavfi/showspectrum: pretty-align constants.

Binary object unchanged.

6 years agoAdding AlphaMode element to Matroska Parser
Vignesh Venkatasubramanian [Mon, 4 Feb 2013 23:17:52 +0000 (15:17 -0800)]
Adding AlphaMode element to Matroska Parser

Adding support for parsing AlphaMode element in the Track header
and export that information as a metadata tag. This flag indicates
presence of alpha channel data in BlockAdditional element.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoapichanges: fix 2 wrong hashes
Michael Niedermayer [Thu, 14 Feb 2013 20:13:32 +0000 (21:13 +0100)]
apichanges: fix 2 wrong hashes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoapichanges: Use , instead of / to seperate multiple hashes
Michael Niedermayer [Thu, 14 Feb 2013 19:34:10 +0000 (20:34 +0100)]
apichanges: Use , instead of / to seperate multiple hashes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoapichanges: fix date
Michael Niedermayer [Thu, 14 Feb 2013 19:32:24 +0000 (20:32 +0100)]
apichanges: fix date

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil: Ensure that emms_c is always defined, even on non-x86
Diego Biurrun [Thu, 14 Feb 2013 18:07:21 +0000 (19:07 +0100)]
avutil: Ensure that emms_c is always defined, even on non-x86

6 years agofate: Add encrypted tta stream test
James Almer [Thu, 14 Feb 2013 00:56:01 +0000 (21:56 -0300)]
fate: Add encrypted tta stream test

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomovenc: hotfix, dont store fiel for h264 / mpeg4-asp / dnxhd
Michael Niedermayer [Thu, 14 Feb 2013 16:11:34 +0000 (17:11 +0100)]
movenc: hotfix, dont store fiel for h264 / mpeg4-asp / dnxhd

Other software does not store it in this case, and the information
is provided by the codec stream

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: Move MinGW CPPFLAGS setting to libc section, where it belongs
Diego Biurrun [Wed, 13 Feb 2013 19:00:47 +0000 (20:00 +0100)]
configure: Move MinGW CPPFLAGS setting to libc section, where it belongs

6 years agoavutil: Move emms code to x86-specific header
Diego Biurrun [Tue, 22 Jan 2013 01:22:29 +0000 (02:22 +0100)]
avutil: Move emms code to x86-specific header

6 years agolavfi/vf_ass: reindent after last commit.
Nicolas George [Thu, 14 Feb 2013 15:35:49 +0000 (16:35 +0100)]
lavfi/vf_ass: reindent after last commit.

6 years agolavfi/vf_ass: ignore subtitles decoding errors.
Nicolas George [Wed, 13 Feb 2013 09:26:42 +0000 (10:26 +0100)]
lavfi/vf_ass: ignore subtitles decoding errors.

A broken packet with invalid data in the middle of the stream
should not prevent from decoding the rest of the file.

Work around trac ticket #2264.

6 years agoWrite the fiel atom to mov files independently of the used video coded.
Carl Eugen Hoyos [Thu, 14 Feb 2013 14:08:37 +0000 (15:08 +0100)]
Write the fiel atom to mov files independently of the used video coded.

The QuickTime specification does not contain any hint that the atom
must not be written in some cases and both the QuickTime and the
AVID decoders do not fail if the atom is present.

This change allows to signal (visually) interlaced streams with
a codec different from uncompressed video.

As a side-effect, this fixes ticket #2202

6 years agolavfi: remove softskip libmpcodecs wrapper
Paul B Mahol [Wed, 13 Feb 2013 17:03:37 +0000 (17:03 +0000)]
lavfi: remove softskip libmpcodecs wrapper

It is supposed to be used with mencoder only and does
nothing when used with ffmpeg.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi: remove dsize libmpcodecs wrapper
Paul B Mahol [Wed, 13 Feb 2013 16:55:07 +0000 (16:55 +0000)]
lavfi: remove dsize libmpcodecs wrapper

Filter does nothing, and supposed funcionality
is already available with native filter(s).

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 14 Feb 2013 10:00:22 +0000 (11:00 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc/platform: Fix 10l typo
  dsputil: Move STRIDE_ALIGN macro to the only place it is used

Conflicts:
libavcodec/dsputil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/APIchanges: fix odd .01 versions
Michael Niedermayer [Thu, 14 Feb 2013 02:31:31 +0000 (03:31 +0100)]
doc/APIchanges: fix odd .01 versions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomatroskadec: simplify additional_id writing code
Michael Niedermayer [Wed, 13 Feb 2013 23:55:25 +0000 (00:55 +0100)]
matroskadec: simplify additional_id writing code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAdding support for parsing BlockAdditional
Vignesh Venkatasubramanian [Wed, 13 Feb 2013 21:51:48 +0000 (13:51 -0800)]
Adding support for parsing BlockAdditional

Matroska specification lists support for BlockAdditional element
which is not supported by ffmpeg's matroska parser. This patch
adds grammar definitions for parsing that element (and few other
related elements) and then puts the data in AVPacket.side_data
with new AVPacketSideDataType AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: Use mb itself as memcpy anchor and assert the other anchors position
Michael Niedermayer [Wed, 13 Feb 2013 23:33:28 +0000 (00:33 +0100)]
h264: Use mb itself as memcpy anchor and assert the other anchors position

This makes the code more robust against reordering or fields.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/platform: Fix 10l typo
Derek Buitenhuis [Wed, 13 Feb 2013 23:41:37 +0000 (18:41 -0500)]
doc/platform: Fix 10l typo

This error was somehow missed for months.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoh264: remove clear_blocks call in threading init.
Ronald S. Bultje [Tue, 12 Feb 2013 02:08:45 +0000 (18:08 -0800)]
h264: remove clear_blocks call in threading init.

Init code in that if statement goes down from 26716 cycles to 26047
cycles, i.e. the removal of the clear_blocks and smaller memcpy()
together save around 670 cycles.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: Reset last_pocs in case of reference or frame number inconsistencies
Michael Niedermayer [Wed, 13 Feb 2013 21:36:07 +0000 (22:36 +0100)]
h264: Reset last_pocs in case of reference or frame number inconsistencies

This prevents faulty increasing of has_b_frames
Should fix Ticket 2062

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodsputil: Move STRIDE_ALIGN macro to the only place it is used
Diego Biurrun [Fri, 8 Feb 2013 14:55:52 +0000 (15:55 +0100)]
dsputil: Move STRIDE_ALIGN macro to the only place it is used

6 years agodoc/dev: clarify public symbols prefixes.
Clément Bœsch [Wed, 13 Feb 2013 19:19:32 +0000 (20:19 +0100)]
doc/dev: clarify public symbols prefixes.

6 years agoWAV muxer: reindent
Daniel Verkamp [Tue, 12 Feb 2013 16:36:01 +0000 (09:36 -0700)]
WAV muxer: reindent

6 years agoswr: check channel layouts before using them.
Michael Niedermayer [Wed, 13 Feb 2013 16:49:16 +0000 (17:49 +0100)]
swr: check channel layouts before using them.

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/transpose: support more pix fmts
Paul B Mahol [Tue, 12 Feb 2013 13:45:23 +0000 (13:45 +0000)]
lavfi/transpose: support more pix fmts

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavu/intreadwrite: add AV_[RW][BLN]48
Paul B Mahol [Wed, 13 Feb 2013 13:15:37 +0000 (13:15 +0000)]
lavu/intreadwrite: add AV_[RW][BLN]48

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolibvorbisdec: Remove AVFrame from context
Michael Niedermayer [Wed, 13 Feb 2013 14:54:47 +0000 (15:54 +0100)]
libvorbisdec: Remove AVFrame from context

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibvorbisdec: set sample type
Michael Niedermayer [Wed, 13 Feb 2013 14:38:00 +0000 (15:38 +0100)]
libvorbisdec: set sample type

Fixes regression

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibcelt: decode directly to the user-provided AVFrame.
Nicolas George [Wed, 13 Feb 2013 13:32:27 +0000 (14:32 +0100)]
libcelt: decode directly to the user-provided AVFrame.

6 years agolavf/concatdec: allow probing.
Nicolas George [Sun, 3 Feb 2013 09:27:11 +0000 (10:27 +0100)]
lavf/concatdec: allow probing.

6 years agolavf/concatdec: add signature directive.
Nicolas George [Sun, 3 Feb 2013 09:22:57 +0000 (10:22 +0100)]
lavf/concatdec: add signature directive.

6 years agolavf/concatdec: add safe option.
Nicolas George [Sun, 3 Feb 2013 09:16:33 +0000 (10:16 +0100)]
lavf/concatdec: add safe option.

6 years agomjpegdec: pass nb_components into ljpeg_decode_yuv_scan
Michael Niedermayer [Wed, 13 Feb 2013 13:20:01 +0000 (14:20 +0100)]
mjpegdec: pass nb_components into ljpeg_decode_yuv_scan

Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoevrcdec: decode directly to the user-provided AVFrame
Paul B Mahol [Wed, 13 Feb 2013 12:24:52 +0000 (12:24 +0000)]
evrcdec: decode directly to the user-provided AVFrame

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agopaf: decode directly to the user-provided AVFrame
Paul B Mahol [Wed, 13 Feb 2013 12:20:39 +0000 (12:20 +0000)]
paf: decode directly to the user-provided AVFrame

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agovima: decode directly to the user-provided AVFrame
Paul B Mahol [Wed, 13 Feb 2013 12:06:40 +0000 (12:06 +0000)]
vima: decode directly to the user-provided AVFrame

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 13 Feb 2013 11:58:24 +0000 (12:58 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavr: fix mixing matrix reduction when normalization is disabled
  lavr: fix matrix reduction for upmixing in certain cases
  lavr: cosmetics: reindent

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1647da89dd8ac09a55c111589f7a30d7e6b87d90'
Michael Niedermayer [Wed, 13 Feb 2013 11:54:03 +0000 (12:54 +0100)]
Merge commit '1647da89dd8ac09a55c111589f7a30d7e6b87d90'

* commit '1647da89dd8ac09a55c111589f7a30d7e6b87d90':
  lavr: make sure that the mix function is reset even if no mixing will be done
  lavr: print out the mix matrix in ff_audio_mix_set_matrix()
  ws-snd1: decode directly to the user-provided AVFrame
  wmavoice: decode directly to the user-provided AVFrame

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '205a95f7b5178362874bc1e65eae9866723491c1'
Michael Niedermayer [Wed, 13 Feb 2013 11:49:48 +0000 (12:49 +0100)]
Merge commit '205a95f7b5178362874bc1e65eae9866723491c1'

* commit '205a95f7b5178362874bc1e65eae9866723491c1':
  wmaenc: alloc/free coded_frame instead of keeping it in the WMACodecContext
  wma: decode directly to the user-provided AVFrame
  wmapro: decode directly to the user-provided AVFrame
  wavpack: decode directly to the user-provided AVFrame

Conflicts:
libavcodec/wavpack.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ee6ca11b657515ad736ec0d2b8635e098d0a2680'
Michael Niedermayer [Wed, 13 Feb 2013 11:42:14 +0000 (12:42 +0100)]
Merge commit 'ee6ca11b657515ad736ec0d2b8635e098d0a2680'

* commit 'ee6ca11b657515ad736ec0d2b8635e098d0a2680':
  vorbis: decode directly to the user-provided AVFrame
  vmdaudio: decode directly to the user-provided AVFrame
  twinvq: decode directly to the user-provided AVFrame
  tta: decode directly to the user-provided AVFrame
  truespeech: decode directly to the user-provided AVFrame

Conflicts:
libavcodec/tta.c
libavcodec/twinvq.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4a2b26fc1b1ad123eba473a20e270f2b0ba92bca'
Michael Niedermayer [Wed, 13 Feb 2013 11:35:37 +0000 (12:35 +0100)]
Merge commit '4a2b26fc1b1ad123eba473a20e270f2b0ba92bca'

* commit '4a2b26fc1b1ad123eba473a20e270f2b0ba92bca':
  tak: decode directly to the user-provided AVFrame
  smackaud: decode directly to the user-provided AVFrame
  sipr: decode directly to the user-provided AVFrame
  shorten: decode directly to the user-provided AVFrame

Conflicts:
libavcodec/shorten.c
libavcodec/takdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5d5c248c3df30fa91a8dde639618c985b9a11c53'
Michael Niedermayer [Wed, 13 Feb 2013 11:28:22 +0000 (12:28 +0100)]
Merge commit '5d5c248c3df30fa91a8dde639618c985b9a11c53'

* commit '5d5c248c3df30fa91a8dde639618c985b9a11c53':
  s302m: decode directly to the user-provided AVFrame
  ra288: decode directly to the user-provided AVFrame
  ra144: decode directly to the user-provided AVFrame
  ralf: decode directly to the user-provided AVFrame
  qdm2: decode directly to the user-provided AVFrame

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1b9b6d6e5ea556b6d307f9d473f54f6406fdc3c8'
Michael Niedermayer [Wed, 13 Feb 2013 11:21:00 +0000 (12:21 +0100)]
Merge commit '1b9b6d6e5ea556b6d307f9d473f54f6406fdc3c8'

* commit '1b9b6d6e5ea556b6d307f9d473f54f6406fdc3c8':
  qcelp: decode directly to the user-provided AVFrame
  pcm-bluray: decode directly to the user-provided AVFrame
  nellymoser: decode directly to the user-provided AVFrame
  mpc7/8: decode directly to the user-provided AVFrame
  mpegaudio: decode directly to the user-provided AVFrame
  mlp/truehd: decode directly to the user-provided AVFrame

Conflicts:
libavcodec/mpc7.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '86bfcfcf2364bc837b7bb582c66a8a15a332414f'
Michael Niedermayer [Wed, 13 Feb 2013 11:14:46 +0000 (12:14 +0100)]
Merge commit '86bfcfcf2364bc837b7bb582c66a8a15a332414f'

* commit '86bfcfcf2364bc837b7bb582c66a8a15a332414f':
  mace: decode directly to the user-provided AVFrame
  libspeex: decode directly to the user-provided AVFrame
  libopus: decode directly to the user-provided AVFrame
  libopencore-amr: decode directly to the user-provided AVFrame
  libgsm: decode directly to the user-provided AVFrame

Conflicts:
libavcodec/libopusdec.c
libavcodec/mace.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a8ea936a0a00570f61a16a588821b52f6a3115c2'
Michael Niedermayer [Wed, 13 Feb 2013 11:05:00 +0000 (12:05 +0100)]
Merge commit 'a8ea936a0a00570f61a16a588821b52f6a3115c2'

* commit 'a8ea936a0a00570f61a16a588821b52f6a3115c2':
  libilbc: decode directly to the user-provided AVFrame
  dpcm: decode directly to the user-provided AVFrame
  imc/iac: decode directly to the user-provided AVFrame
  gsm: decode directly to the user-provided AVFrame

Conflicts:
libavcodec/dpcm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'cb7b47a61dba0b9329ecede5dd3211dc0662dc05'
Michael Niedermayer [Wed, 13 Feb 2013 10:59:51 +0000 (11:59 +0100)]
Merge commit 'cb7b47a61dba0b9329ecede5dd3211dc0662dc05'

* commit 'cb7b47a61dba0b9329ecede5dd3211dc0662dc05':
  g726: decode directly to the user-provided AVFrame
  g723.1: decode directly to the user-provided AVFrame
  g722: decode directly to the user-provided AVFrame
  flac: decode directly to the user-provided AVFrame
  cinaudio: decode directly to the user-provided AVFrame

Conflicts:
libavcodec/g723_1.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '182821cff43f5f977004d105b86c47ceb20d00d6'
Michael Niedermayer [Wed, 13 Feb 2013 10:53:23 +0000 (11:53 +0100)]
Merge commit '182821cff43f5f977004d105b86c47ceb20d00d6'

* commit '182821cff43f5f977004d105b86c47ceb20d00d6':
  dca: decode directly to the user-provided AVFrame
  cook: decode directly to the user-provided AVFrame
  comfortnoise: decode directly to the user-provided AVFrame
  bmvaudio: decode directly to the user-provided AVFrame
  pcm: decode directly to the user-provided AVFrame

Conflicts:
libavcodec/pcm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5cc0bd2cb47cbb1040f2bb0ded8d72a442c79b20'
Michael Niedermayer [Wed, 13 Feb 2013 10:45:25 +0000 (11:45 +0100)]
Merge commit '5cc0bd2cb47cbb1040f2bb0ded8d72a442c79b20'

* commit '5cc0bd2cb47cbb1040f2bb0ded8d72a442c79b20':
  binkaudio: decode directly to the user-provided AVFrame
  atrac3: decode directly to the user-provided AVFrame
  atrac1: decode directly to the user-provided AVFrame
  ape: decode directly to the user-provided AVFrame
  amrwb: decode directly to the user-provided AVFrame

Conflicts:
libavcodec/amrwbdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e3db34291f4401a16f6ac92721617a9f33cd4c31'
Michael Niedermayer [Wed, 13 Feb 2013 10:36:28 +0000 (11:36 +0100)]
Merge commit 'e3db34291f4401a16f6ac92721617a9f33cd4c31'

* commit 'e3db34291f4401a16f6ac92721617a9f33cd4c31':
  amrnb: decode directly to the user-provided AVFrame
  als: decode directly to the user-provided AVFrame
  alac: decode directly to the user-provided AVFrame
  adxenc: alloc/free coded_frame instead of keeping it in the ADXContext
  adx: decode directly to the user-provided AVFrame

Conflicts:
libavcodec/alsdec.c
libavcodec/amrnbdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e57daa876bf0cf50782550e366e589441cd8c2bd'
Michael Niedermayer [Wed, 13 Feb 2013 10:18:55 +0000 (11:18 +0100)]
Merge commit 'e57daa876bf0cf50782550e366e589441cd8c2bd'

* commit 'e57daa876bf0cf50782550e366e589441cd8c2bd':
  adpcm: decode directly to the user-provided AVFrame
  ac3: decode directly to the user-provided AVFrame
  aac: decode directly to the user-provided AVFrame
  8svx: decode directly to the user-provided AVFrame

Conflicts:
libavcodec/8svx.c
libavcodec/ac3dec.c
libavcodec/adpcm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/demuxers: quote command line arguments with @code
Daniel Verkamp [Tue, 12 Feb 2013 18:15:51 +0000 (11:15 -0700)]
doc/demuxers: quote command line arguments with @code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoshorten: dont leave invalid channel counts in the context.
Michael Niedermayer [Wed, 13 Feb 2013 00:03:30 +0000 (01:03 +0100)]
shorten: dont leave invalid channel counts in the context.

Fixes freeing invalid addresses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotiff: Check buffer allocation and pointer increment more carefully in shorts2str...
Michael Niedermayer [Tue, 12 Feb 2013 22:40:24 +0000 (23:40 +0100)]
tiff: Check buffer allocation and pointer increment more carefully in shorts2str() and double2str()

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofaxcompr: Dont read ref when the end has been reached in pass mode
Michael Niedermayer [Tue, 12 Feb 2013 21:14:50 +0000 (22:14 +0100)]
faxcompr: Dont read ref when the end has been reached in pass mode

Fixes reading over the end

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopngdec/filter: dont access out of array elements at the end
Michael Niedermayer [Tue, 12 Feb 2013 18:53:40 +0000 (19:53 +0100)]
pngdec/filter: dont access out of array elements at the end

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavr: fix mixing matrix reduction when normalization is disabled
Justin Ruggles [Sun, 27 Jan 2013 19:47:54 +0000 (14:47 -0500)]
lavr: fix mixing matrix reduction when normalization is disabled

In some cases when an input contributes fully to the corresponding
output, other inputs may also contribute to the same output. This is the
case, for example, for the default 5.1 to stereo downmix matrix without
normalization.

6 years agolavr: fix matrix reduction for upmixing in certain cases
Justin Ruggles [Fri, 18 Jan 2013 18:44:10 +0000 (13:44 -0500)]
lavr: fix matrix reduction for upmixing in certain cases

Do not skip an output if the corresponding input contributes to other output
channels.

6 years agolavr: cosmetics: reindent
Justin Ruggles [Fri, 18 Jan 2013 18:34:26 +0000 (13:34 -0500)]
lavr: cosmetics: reindent

6 years agolavr: make sure that the mix function is reset even if no mixing will be done
Justin Ruggles [Fri, 18 Jan 2013 18:27:50 +0000 (13:27 -0500)]
lavr: make sure that the mix function is reset even if no mixing will be done

If the matrix reduction ends up with no mixing matrix needed, we need to still
reset the mix function accordingly and log the info to the user.

6 years agolavr: print out the mix matrix in ff_audio_mix_set_matrix()
Justin Ruggles [Fri, 18 Jan 2013 18:25:19 +0000 (13:25 -0500)]
lavr: print out the mix matrix in ff_audio_mix_set_matrix()

This will print the new matrix if it is set after initialization.

6 years agowmaenc: alloc/free coded_frame instead of keeping it in the WMACodecContext
Justin Ruggles [Mon, 24 Dec 2012 01:26:15 +0000 (20:26 -0500)]
wmaenc: alloc/free coded_frame instead of keeping it in the WMACodecContext

6 years agows-snd1: decode directly to the user-provided AVFrame
Justin Ruggles [Mon, 24 Dec 2012 01:31:24 +0000 (20:31 -0500)]
ws-snd1: decode directly to the user-provided AVFrame

6 years agowma: decode directly to the user-provided AVFrame
Justin Ruggles [Mon, 24 Dec 2012 01:25:52 +0000 (20:25 -0500)]
wma: decode directly to the user-provided AVFrame

6 years agowmavoice: decode directly to the user-provided AVFrame
Justin Ruggles [Mon, 24 Dec 2012 01:29:44 +0000 (20:29 -0500)]
wmavoice: decode directly to the user-provided AVFrame

6 years agovorbis: decode directly to the user-provided AVFrame
Justin Ruggles [Mon, 24 Dec 2012 01:11:36 +0000 (20:11 -0500)]
vorbis: decode directly to the user-provided AVFrame

6 years agotak: decode directly to the user-provided AVFrame
Justin Ruggles [Mon, 24 Dec 2012 01:02:46 +0000 (20:02 -0500)]
tak: decode directly to the user-provided AVFrame

6 years agowmapro: decode directly to the user-provided AVFrame
Justin Ruggles [Mon, 24 Dec 2012 01:16:21 +0000 (20:16 -0500)]
wmapro: decode directly to the user-provided AVFrame

6 years agovmdaudio: decode directly to the user-provided AVFrame
Justin Ruggles [Mon, 24 Dec 2012 01:10:01 +0000 (20:10 -0500)]
vmdaudio: decode directly to the user-provided AVFrame

6 years agosmackaud: decode directly to the user-provided AVFrame
Justin Ruggles [Mon, 24 Dec 2012 01:00:41 +0000 (20:00 -0500)]
smackaud: decode directly to the user-provided AVFrame

6 years agowavpack: decode directly to the user-provided AVFrame
Justin Ruggles [Mon, 24 Dec 2012 01:13:08 +0000 (20:13 -0500)]
wavpack: decode directly to the user-provided AVFrame

6 years agotwinvq: decode directly to the user-provided AVFrame
Justin Ruggles [Mon, 24 Dec 2012 01:08:05 +0000 (20:08 -0500)]
twinvq: decode directly to the user-provided AVFrame

6 years agosipr: decode directly to the user-provided AVFrame
Justin Ruggles [Mon, 24 Dec 2012 00:58:35 +0000 (19:58 -0500)]
sipr: decode directly to the user-provided AVFrame