ffmpeg.git
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 27 Feb 2013 11:35:13 +0000 (12:35 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: dsputil: Drop some unused function #defines

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

* commit '845cfc92f908791714b8c4c8a49c91b8c64b685e':
  x86: dsputil: Drop aliasing of ff_put_pixels8_mmx to ff_put_pixels8_mmxext

Conflicts:
libavcodec/x86/dsputil_mmx.c

Note, the commit message is wrong, there are no mmxext instructions as
claimed in the function. The change should do no harm though

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

* commit '096cc11ec102701a18951b4f0437d609081ca1dd':
  x86: vc1dsp: Move ff_avg_vc1_mspel_mc00_mmxext out of dsputil_mmx.c

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

* commit '31a23a0dc663bd42bf593275971b4277a479b73d':
  x86: dsputil_mmx: Remove leftover inline assembly fragments

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agooggdec: chained oggs have timestamp discontinuities
Michael Niedermayer [Sun, 20 Jan 2013 17:38:24 +0000 (18:38 +0100)]
oggdec: chained oggs have timestamp discontinuities

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec: mbd has a range of 0..2
Michael Niedermayer [Wed, 27 Feb 2013 02:04:04 +0000 (03:04 +0100)]
avcodec: mbd has a range of 0..2

Fixes Ticket2219

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegvideo_enc: fix gray flag with 444 jpeg
Michael Niedermayer [Wed, 27 Feb 2013 01:56:06 +0000 (02:56 +0100)]
mpegvideo_enc: fix gray flag with 444 jpeg

Fixes Ticket2155

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg_opt: add -to option to specify stop time
Jean First [Tue, 26 Feb 2013 23:18:41 +0000 (00:18 +0100)]
ffmpeg_opt: add -to option to specify stop time

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86: dsputil: Drop some unused function #defines
Diego Biurrun [Tue, 26 Feb 2013 19:13:14 +0000 (20:13 +0100)]
x86: dsputil: Drop some unused function #defines

6 years agox86: dsputil: Drop aliasing of ff_put_pixels8_mmx to ff_put_pixels8_mmxext
Diego Biurrun [Tue, 26 Feb 2013 18:26:03 +0000 (19:26 +0100)]
x86: dsputil: Drop aliasing of ff_put_pixels8_mmx to ff_put_pixels8_mmxext

The external assembly function uses mmxext instructions and should not be
masqueraded as an mmx-only function. Instead, use the mmx-only inline
assembly function.

6 years agox86: vc1dsp: Move ff_avg_vc1_mspel_mc00_mmxext out of dsputil_mmx.c
Diego Biurrun [Tue, 26 Feb 2013 16:29:48 +0000 (17:29 +0100)]
x86: vc1dsp: Move ff_avg_vc1_mspel_mc00_mmxext out of dsputil_mmx.c

6 years agox86: dsputil_mmx: Remove leftover inline assembly fragments
Martin Storsjö [Tue, 26 Feb 2013 17:35:51 +0000 (19:35 +0200)]
x86: dsputil_mmx: Remove leftover inline assembly fragments

These became unused in 71155d7b.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agompeg12: Detect MXF essence stuff at the end of frames
Michael Niedermayer [Tue, 26 Feb 2013 17:55:44 +0000 (18:55 +0100)]
mpeg12: Detect MXF essence stuff at the end of frames

Fixes some of the issues with segment.mov

See: 0226 15:16 Joseph Artsimov (2.1K) [FFmpeg-devel] Two problems with MPEG2 decoder
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswscale-test: fix 3 pointer type warnings
Michael Niedermayer [Tue, 26 Feb 2013 15:50:32 +0000 (16:50 +0100)]
swscale-test: fix 3 pointer type warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoaacsbr: Silence warning: max_qmf_subbands may be used uninitialized in this function
Michael Niedermayer [Tue, 26 Feb 2013 15:36:29 +0000 (16:36 +0100)]
aacsbr: Silence warning: max_qmf_subbands may be used uninitialized in this function

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 26 Feb 2013 12:13:03 +0000 (13:13 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: icc: Drop nonsense adding of cpuflags to LDFLAGS

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

* commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f':
  Remove unnecessary dsputil.h #includes

Conflicts:
libavcodec/ffv1.c
libavcodec/h261dec.c
libavcodec/h261enc.c
libavcodec/h264pred.c
libavcodec/lpc.h
libavcodec/mjpegdec.c
libavcodec/rectangle.h
libavcodec/x86/idct_sse2_xvid.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '76b19a3984359b3be44d4f7e4e69b7b86729a622'
Michael Niedermayer [Tue, 26 Feb 2013 11:56:46 +0000 (12:56 +0100)]
Merge commit '76b19a3984359b3be44d4f7e4e69b7b86729a622'

* commit '76b19a3984359b3be44d4f7e4e69b7b86729a622':
  Fix a number of incorrect intmath.h #includes.
  avconv: remove an unused variable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e8da807537e314d74cb6d93598f1dcfb891fa655'
Michael Niedermayer [Tue, 26 Feb 2013 11:50:34 +0000 (12:50 +0100)]
Merge commit 'e8da807537e314d74cb6d93598f1dcfb891fa655'

* commit 'e8da807537e314d74cb6d93598f1dcfb891fa655':
  cmdutils: only use libavresample when it is enabled
  libschroedinger: cosmetics: rename variable avccontext to avctx
  vorbisenc: cosmetics: rename variable avccontext to avctx

Conflicts:
cmdutils.c
libavcodec/libschroedinger.c
libavcodec/libschroedingerenc.c
libavcodec/vorbisenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e951b6d94c441d46b396ef12da1428297d77251d'
Michael Niedermayer [Tue, 26 Feb 2013 11:39:26 +0000 (12:39 +0100)]
Merge commit 'e951b6d94c441d46b396ef12da1428297d77251d'

* commit 'e951b6d94c441d46b396ef12da1428297d77251d':
  vorbisdec: cosmetics: rename variable avccontext to avctx
  configure: Identify icc compiler with a less ambiguous pattern

Conflicts:
libavcodec/vorbisdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b58b00aeca21de00ab6da2944684f784d9d6bc47'
Michael Niedermayer [Tue, 26 Feb 2013 11:32:17 +0000 (12:32 +0100)]
Merge commit 'b58b00aeca21de00ab6da2944684f784d9d6bc47'

* commit 'b58b00aeca21de00ab6da2944684f784d9d6bc47':
  configure: Separate "ln" command line arguments

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoac3enc_template: silence may be used uninitialized in this function warnings
Michael Niedermayer [Tue, 26 Feb 2013 01:32:44 +0000 (02:32 +0100)]
ac3enc_template: silence may be used uninitialized in this function warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomotion-test: fix warning: dsp_mask is deprecated
Michael Niedermayer [Mon, 25 Feb 2013 23:32:02 +0000 (00:32 +0100)]
motion-test: fix warning: dsp_mask is deprecated

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavcodec/motion-test: set the bitexact flag
Michael Niedermayer [Tue, 26 Feb 2013 01:48:18 +0000 (02:48 +0100)]
libavcodec/motion-test: set the bitexact flag

this is needed for testing mmx2 functions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: icc: Drop nonsense adding of cpuflags to LDFLAGS
Diego Biurrun [Mon, 25 Feb 2013 20:03:47 +0000 (21:03 +0100)]
configure: icc: Drop nonsense adding of cpuflags to LDFLAGS

This fixes many icc warnings when not setting the CPU type.

6 years agoRemove unnecessary dsputil.h #includes
Diego Biurrun [Sat, 23 Feb 2013 19:10:38 +0000 (20:10 +0100)]
Remove unnecessary dsputil.h #includes

6 years agoFix a number of incorrect intmath.h #includes.
Diego Biurrun [Mon, 25 Feb 2013 21:39:46 +0000 (22:39 +0100)]
Fix a number of incorrect intmath.h #includes.

6 years agoavconv: remove an unused variable
Justin Ruggles [Mon, 25 Feb 2013 17:26:57 +0000 (12:26 -0500)]
avconv: remove an unused variable

6 years agocmdutils: only use libavresample when it is enabled
Justin Ruggles [Mon, 25 Feb 2013 02:32:30 +0000 (21:32 -0500)]
cmdutils: only use libavresample when it is enabled

avprobe and avserver use cmdutils and do not strictly require libavresample.

6 years agovorbisdec: cosmetics: rename variable avccontext to avctx
Justin Ruggles [Sun, 24 Feb 2013 17:56:36 +0000 (12:56 -0500)]
vorbisdec: cosmetics: rename variable avccontext to avctx

This is consistent with the rest of libavcodec.

6 years agolibschroedinger: cosmetics: rename variable avccontext to avctx
Justin Ruggles [Sun, 24 Feb 2013 18:15:12 +0000 (13:15 -0500)]
libschroedinger: cosmetics: rename variable avccontext to avctx

This is consistent with the rest of libavcodec.

6 years agovorbisenc: cosmetics: rename variable avccontext to avctx
Justin Ruggles [Sun, 24 Feb 2013 18:07:27 +0000 (13:07 -0500)]
vorbisenc: cosmetics: rename variable avccontext to avctx

This is consistent with the rest of libavcodec.

6 years agolibvpx: check if CQ level is in correct bounds
slhck [Mon, 25 Feb 2013 18:23:55 +0000 (19:23 +0100)]
libvpx: check if CQ level is in correct bounds

Check whether CQ level is within qmin..qmax and abort on error. If this isn't properly
set, encoding will fail at the first frame.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibvpx: allow 0 as min quantizer value
slhck [Mon, 25 Feb 2013 18:12:19 +0000 (19:12 +0100)]
libvpx: allow 0 as min quantizer value

Allow setting the min quantizer to 0 instead of 1 (libvpx allows 0); fixes #2136

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg_opt: cosmetics
Jean First [Mon, 25 Feb 2013 12:10:51 +0000 (13:10 +0100)]
ffmpeg_opt: cosmetics

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopmpdec: make i unsigned, avoid undefined behavior of i++
Michael Niedermayer [Sun, 24 Feb 2013 22:37:47 +0000 (23:37 +0100)]
pmpdec: make i unsigned, avoid undefined behavior of i++

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopmpdec: fix integer overflow
Michael Niedermayer [Sun, 24 Feb 2013 21:53:58 +0000 (22:53 +0100)]
pmpdec: fix integer overflow

Its unlikely this affects any valid files.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: Identify icc compiler with a less ambiguous pattern
Diego Biurrun [Mon, 25 Feb 2013 16:05:22 +0000 (17:05 +0100)]
configure: Identify icc compiler with a less ambiguous pattern

6 years agoconfigure: Separate "ln" command line arguments
Diego Biurrun [Mon, 25 Feb 2013 14:51:47 +0000 (15:51 +0100)]
configure: Separate "ln" command line arguments

This is more compatible and not more complicated.

6 years agofate: update pixfmts_hflip
Paul B Mahol [Mon, 25 Feb 2013 13:16:44 +0000 (13:16 +0000)]
fate: update pixfmts_hflip

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/hflip: support more formats
Paul B Mahol [Mon, 25 Feb 2013 10:31:39 +0000 (10:31 +0000)]
lavfi/hflip: support more formats

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/geq: improve support for formats with alpha plane
Paul B Mahol [Mon, 25 Feb 2013 09:14:24 +0000 (09:14 +0000)]
lavfi/geq: improve support for formats with alpha plane

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

* qatar/master:
  vorbisdec: Accept 0 amplitude_bits

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5b47c19bfda92273ae49e83db26a565afcaed80a'
Michael Niedermayer [Mon, 25 Feb 2013 11:51:59 +0000 (12:51 +0100)]
Merge commit '5b47c19bfda92273ae49e83db26a565afcaed80a'

* commit '5b47c19bfda92273ae49e83db26a565afcaed80a':
  vorbisdec: Add missing checks

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'fc386f2eea8d93ecd4f81e1646c835d1645c56a0'
Michael Niedermayer [Mon, 25 Feb 2013 11:30:30 +0000 (12:30 +0100)]
Merge commit 'fc386f2eea8d93ecd4f81e1646c835d1645c56a0'

* commit 'fc386f2eea8d93ecd4f81e1646c835d1645c56a0':
  vorbisdec: cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '11dcecfcca0eca1a571792c4fa3c21fb2cfddddc'
Michael Niedermayer [Mon, 25 Feb 2013 11:18:43 +0000 (12:18 +0100)]
Merge commit '11dcecfcca0eca1a571792c4fa3c21fb2cfddddc'

* commit '11dcecfcca0eca1a571792c4fa3c21fb2cfddddc':
  vorbisdec: Error on bark_map_size equal to 0.
  dsputil_alpha.h: Add missing stddef.h header to fix standalone compilation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovorbisdec: Accept 0 amplitude_bits
Luca Barbato [Sun, 24 Feb 2013 15:56:15 +0000 (16:56 +0100)]
vorbisdec: Accept 0 amplitude_bits

The specification does not prevent an encoder to write the amplitude 0
as 0 amplitude_bits.

Our get_bits() implementation might not support a zero sized read
properly, thus the additional branch.

6 years agovorbisdec: Add missing checks
Luca Barbato [Sun, 24 Feb 2013 11:30:30 +0000 (12:30 +0100)]
vorbisdec: Add missing checks

Rate and order must not be 0 even if the specification does not say that
explicitly.

6 years agovorbisdec: cosmetics
Luca Barbato [Sun, 24 Feb 2013 11:21:40 +0000 (12:21 +0100)]
vorbisdec: cosmetics

Use the commonly used "if (!var)" instead of "if (var == 0)".

6 years agovorbisdec: Error on bark_map_size equal to 0.
Michael Niedermayer [Thu, 10 Jan 2013 23:54:12 +0000 (00:54 +0100)]
vorbisdec: Error on bark_map_size equal to 0.

The value is used to calculate output LSP curve and a division by zero
and out of array accesses would occur.

CVE-2013-0894

CC: libav-stable@libav.org
Reported-by: Dale Curtis <dalecurtis@chromium.org>
Found-by: inferno@chromium.org
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoaf_biquads: memset(0) cache
Michael Niedermayer [Mon, 25 Feb 2013 02:33:18 +0000 (03:33 +0100)]
af_biquads: memset(0) cache

Fixes valgrind warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswr: make the default of nopts for first_pts actually work
Michael Niedermayer [Mon, 25 Feb 2013 02:04:03 +0000 (03:04 +0100)]
swr: make the default of nopts for first_pts actually work

Fixes Ticket2210

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: force a first_pts=0 for the aresample test
Michael Niedermayer [Mon, 25 Feb 2013 02:02:54 +0000 (03:02 +0100)]
fate: force a first_pts=0 for the aresample test

This is needed to prevent the next commit from breaking fate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: Force a first_pts of 0 for the first configuration of -async use
Michael Niedermayer [Mon, 25 Feb 2013 02:00:58 +0000 (03:00 +0100)]
ffmpeg: Force a first_pts of 0 for the first configuration of -async use

This is very close to what the default does currently

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffplay: reindent and remove pointless cast in audio_decode_frame() code
Stefano Sabatini [Sun, 24 Feb 2013 22:29:42 +0000 (23:29 +0100)]
ffplay: reindent and remove pointless cast in audio_decode_frame() code

6 years agoffplay: set type for channel_layout AudioParams field to int64_t
Stefano Sabatini [Sun, 3 Feb 2013 20:27:45 +0000 (21:27 +0100)]
ffplay: set type for channel_layout AudioParams field to int64_t

Reflect the type of the corresponding field in lavc/lavfi.

6 years agolavfi/abuffersink: fix weird indent and spacing
Stefano Sabatini [Sun, 3 Feb 2013 20:12:37 +0000 (21:12 +0100)]
lavfi/abuffersink: fix weird indent and spacing

6 years agolavfi/abuffersink: add sample_rates field to AVABufferSinkParams
Stefano Sabatini [Sun, 3 Feb 2013 18:33:58 +0000 (19:33 +0100)]
lavfi/abuffersink: add sample_rates field to AVABufferSinkParams

Allow to select sample rates.

6 years agolavc: change type of AVFrame.channels field from int64_t to int
Stefano Sabatini [Wed, 6 Feb 2013 00:40:38 +0000 (01:40 +0100)]
lavc: change type of AVFrame.channels field from int64_t to int

"channels" is an int in all the other places in the libraries, and the
av_frame_*_channels() accessors return and set an int, so this should not
implicate ABI breaks.

6 years agoffmpeg: use a AVDictionary instead of the context to move swr parameters around
Michael Niedermayer [Sun, 24 Feb 2013 18:07:42 +0000 (19:07 +0100)]
ffmpeg: use a AVDictionary instead of the context to move swr parameters around

This avoids per parameter changes in ffmpeg at the cost of making access
somewhat more annoying.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocmdutils: fix null pointer dereference
Michael Niedermayer [Sun, 24 Feb 2013 19:16:17 +0000 (20:16 +0100)]
cmdutils: fix null pointer dereference

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswr: support a seperate output sample bits.
Michael Niedermayer [Sun, 24 Feb 2013 18:05:54 +0000 (19:05 +0100)]
swr: support a seperate output sample bits.

This avoids user apps having to mangle dither scale. for pcm24

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/avfiltergraph.h: Move public field out of the private fields
Michael Niedermayer [Sun, 24 Feb 2013 17:51:23 +0000 (18:51 +0100)]
avfilter/avfiltergraph.h: Move public field out of the private fields

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswr: add duplicate cutoff for compatibility
Michael Niedermayer [Sun, 24 Feb 2013 17:16:26 +0000 (18:16 +0100)]
swr: add duplicate cutoff for compatibility

Based on
commit 50f4337a2fd3b571b38c9475981e36405d1ca1e1
Author: Justin Ruggles <justin.ruggles@gmail.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: add animated gif decoder tests
Paul B Mahol [Sat, 23 Feb 2013 13:05:43 +0000 (13:05 +0000)]
fate: add animated gif decoder tests

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agofate: add animated gif demuxer test
Paul B Mahol [Sat, 23 Feb 2013 12:58:31 +0000 (12:58 +0000)]
fate: add animated gif demuxer test

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agompeg12: Fix non-hwaccel VDPAU decode.
Reimar Döffinger [Sun, 24 Feb 2013 16:17:41 +0000 (17:17 +0100)]
mpeg12: Fix non-hwaccel VDPAU decode.

Previously avctx->hwaccel would have been set to a dummy value,
now an explicit check is necessary instead.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
6 years agohls: do not access pb->opaque for custom IO.
Reimar Döffinger [Wed, 13 Feb 2013 20:07:55 +0000 (21:07 +0100)]
hls: do not access pb->opaque for custom IO.

As the name indicates we can't just assume what the
"opaque" field contains.
This fixes a crash in third-party applications see e.g.:
http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2126

This fixes also FFmpeg trac #2293, which is a different
third-party application.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
6 years agodsputil_alpha.h: Add missing stddef.h header to fix standalone compilation
Diego Biurrun [Sat, 23 Feb 2013 19:09:44 +0000 (20:09 +0100)]
dsputil_alpha.h: Add missing stddef.h header to fix standalone compilation

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 24 Feb 2013 17:02:37 +0000 (18:02 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: List external libs used using print_enabled()

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '3fc09b0081184f26edbb62d2d72ae89bf9e21768'
Michael Niedermayer [Sun, 24 Feb 2013 16:55:31 +0000 (17:55 +0100)]
Merge commit '3fc09b0081184f26edbb62d2d72ae89bf9e21768'

* commit '3fc09b0081184f26edbb62d2d72ae89bf9e21768':
  configure: Move list of external libs to a separate variable

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '45235ac488363e3360bf2f2275102d1ec66eba0f'
Michael Niedermayer [Sun, 24 Feb 2013 16:45:06 +0000 (17:45 +0100)]
Merge commit '45235ac488363e3360bf2f2275102d1ec66eba0f'

* commit '45235ac488363e3360bf2f2275102d1ec66eba0f':
  configure: Move x11grab option to a more suitable place in the help output
  lavr: allow setting internal_sample_fmt option by string
  lavr: Add "resample_cutoff" option as a duplicate of "cutoff"

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5c7db097ebe1fb5c233cedd8846615074e7d6044'
Michael Niedermayer [Sun, 24 Feb 2013 16:30:52 +0000 (17:30 +0100)]
Merge commit '5c7db097ebe1fb5c233cedd8846615074e7d6044'

* commit '5c7db097ebe1fb5c233cedd8846615074e7d6044':
  avconv: pass libavresample options to AVFilterGraph

Conflicts:
cmdutils.c
cmdutils.h
ffmpeg_filter.c
ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '9f1223562e134bac6345a465870b9d56ff7d60cf'
Michael Niedermayer [Sun, 24 Feb 2013 16:10:55 +0000 (17:10 +0100)]
Merge commit '9f1223562e134bac6345a465870b9d56ff7d60cf'

* commit '9f1223562e134bac6345a465870b9d56ff7d60cf':
  lavfi: connect libavresample options to af_resample via AVFilterGraph

Conflicts:
doc/APIchanges
libavfilter/avfiltergraph.c
libavfilter/avfiltergraph.h
libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd7c450436fcb9d3ecf59884a574e7684183e753d'
Michael Niedermayer [Sun, 24 Feb 2013 15:53:09 +0000 (16:53 +0100)]
Merge commit 'd7c450436fcb9d3ecf59884a574e7684183e753d'

* commit 'd7c450436fcb9d3ecf59884a574e7684183e753d':
  ac3dec: validate channel output mode against channel count

Conflicts:
libavcodec/ac3dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: hwaccel autodetection has been removed in 82ca17ac7a0a08784cb6808384ee237a...
Michael Niedermayer [Sun, 24 Feb 2013 15:40:46 +0000 (16:40 +0100)]
configure: hwaccel autodetection has been removed in 82ca17ac7a0a08784cb6808384ee237ac28e8334

If you want it back (yeah i want it back too)
then you just need to volunteer to maintain the code in configure
thats related to hwaccel autodetection.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: Simplify VDPAU header check
Diego Biurrun [Thu, 21 Feb 2013 11:34:42 +0000 (12:34 +0100)]
configure: Simplify VDPAU header check

Conflicts:

configure

6 years agoMerge commit '82ca17ac7a0a08784cb6808384ee237ac28e8334'
Michael Niedermayer [Sun, 24 Feb 2013 14:45:45 +0000 (15:45 +0100)]
Merge commit '82ca17ac7a0a08784cb6808384ee237ac28e8334'

* commit '82ca17ac7a0a08784cb6808384ee237ac28e8334':
  configure: Fix vaapi/vda/vdpau dependency declarations

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '215cdd35efd625ec28ef5846f1692b18f7c2c230'
Michael Niedermayer [Sun, 24 Feb 2013 14:37:11 +0000 (15:37 +0100)]
Merge commit '215cdd35efd625ec28ef5846f1692b18f7c2c230'

* commit '215cdd35efd625ec28ef5846f1692b18f7c2c230':
  configure: Refactor dxva2api.h dependency declarations

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoexr: make sure that data_size is not bigger than expected
Paul B Mahol [Sun, 24 Feb 2013 14:10:20 +0000 (14:10 +0000)]
exr: make sure that data_size is not bigger than expected

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoexr: simplify filling channel_buffer[]
Paul B Mahol [Sun, 24 Feb 2013 12:28:22 +0000 (12:28 +0000)]
exr: simplify filling channel_buffer[]

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoexr: check color channel subsampling too
Paul B Mahol [Sun, 24 Feb 2013 11:12:59 +0000 (11:12 +0000)]
exr: check color channel subsampling too

If there is unsupported subsampling encountered abort
early instead of failing decoding later.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoexr: slice threading
Paul B Mahol [Fri, 22 Feb 2013 13:34:12 +0000 (13:34 +0000)]
exr: slice threading

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge commit '4cc4b33f71d3982df404fceb4405d656c538bc74'
Michael Niedermayer [Sun, 24 Feb 2013 14:24:38 +0000 (15:24 +0100)]
Merge commit '4cc4b33f71d3982df404fceb4405d656c538bc74'

* commit '4cc4b33f71d3982df404fceb4405d656c538bc74':
  build: Add proper infrastructure for adding and checking host CPPFLAGS

Conflicts:
Makefile
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2aac411fd4c74e22b978525206f3b8257de1842b'
Michael Niedermayer [Sun, 24 Feb 2013 14:06:44 +0000 (15:06 +0100)]
Merge commit '2aac411fd4c74e22b978525206f3b8257de1842b'

* commit '2aac411fd4c74e22b978525206f3b8257de1842b':
  configure: Simplify VDPAU header check

Conflicts:
configure

Not merged as the code seems not to work

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '9840130edf3a969ec06dd0faa61dcf8d90c5f67a'
Michael Niedermayer [Sun, 24 Feb 2013 13:58:06 +0000 (14:58 +0100)]
Merge commit '9840130edf3a969ec06dd0faa61dcf8d90c5f67a'

* commit '9840130edf3a969ec06dd0faa61dcf8d90c5f67a':
  configure: Simplify VDA header and extralibs check

Conflicts:
configure

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

* commit '0a8da1a3e5f0b9329dfb89d17356ff5444c02351':
  configure: Do not redundantly list enabled hwaccel libs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '7432e872066d6960a9fbd31c51a94ebe6183389e'
Michael Niedermayer [Sun, 24 Feb 2013 13:37:44 +0000 (14:37 +0100)]
Merge commit '7432e872066d6960a9fbd31c51a94ebe6183389e'

* commit '7432e872066d6960a9fbd31c51a94ebe6183389e':
  configure: Add print_3_columns helper function and use where appropriate

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '040c565e51985477a8fa5e42d2ddfb26ebde6608'
Michael Niedermayer [Sun, 24 Feb 2013 13:32:55 +0000 (14:32 +0100)]
Merge commit '040c565e51985477a8fa5e42d2ddfb26ebde6608'

* commit '040c565e51985477a8fa5e42d2ddfb26ebde6608':
  doc: developer: Allow tabs in the vim configuration for Automake files
  Remove pointless av_cold attributes in header files

Conflicts:
libavcodec/h264.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopnm: use av_pix_fmt_desc_get()
Michael Niedermayer [Sun, 24 Feb 2013 13:27:08 +0000 (14:27 +0100)]
pnm: use av_pix_fmt_desc_get()

Using the table directly may cause problems on some platforms like msvc

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b5f536d24b5ae360503935c34d5d59fa5181b94d'
Michael Niedermayer [Sun, 24 Feb 2013 13:14:28 +0000 (14:14 +0100)]
Merge commit 'b5f536d24b5ae360503935c34d5d59fa5181b94d'

* commit 'b5f536d24b5ae360503935c34d5d59fa5181b94d':
  pnm: add high-bitdepth PGMYUV support for both encoder and decoder

Conflicts:
libavcodec/pnm.c
libavcodec/pnmdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2f325a6fd4421c4dd4e26d7065e5d4bf26ed52f2'
Michael Niedermayer [Sun, 24 Feb 2013 13:05:16 +0000 (14:05 +0100)]
Merge commit '2f325a6fd4421c4dd4e26d7065e5d4bf26ed52f2'

* commit '2f325a6fd4421c4dd4e26d7065e5d4bf26ed52f2':
  libx264: change i_qfactor to use x264cli's default
  qtrle: use AV_LOG_ERROR in an error message.

Conflicts:
libavcodec/libx264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '7b4f91155bd4ef5a8d4e9af65c48b42bfa5b52c6'
Michael Niedermayer [Sun, 24 Feb 2013 12:55:27 +0000 (13:55 +0100)]
Merge commit '7b4f91155bd4ef5a8d4e9af65c48b42bfa5b52c6'

* commit '7b4f91155bd4ef5a8d4e9af65c48b42bfa5b52c6':
  qtrle: cosmetics, reformat CHECK_PIXEL_PTR() macro

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e10659244782b26061e7d52c06437de32a43a7af'
Michael Niedermayer [Sun, 24 Feb 2013 12:49:37 +0000 (13:49 +0100)]
Merge commit 'e10659244782b26061e7d52c06437de32a43a7af'

* commit 'e10659244782b26061e7d52c06437de32a43a7af':
  qtrle: add more checks against pixel_ptr being negative.

Conflicts:
libavcodec/qtrle.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4f3b058c84f570e261d743c7c22f865617fd28ac'
Michael Niedermayer [Sun, 24 Feb 2013 12:20:25 +0000 (13:20 +0100)]
Merge commit '4f3b058c84f570e261d743c7c22f865617fd28ac'

* commit '4f3b058c84f570e261d743c7c22f865617fd28ac':
  cavs: initialize various context tables to 0
  mlpdec: do not try to allocate a zero-sized output buffer.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '56daf10e0313c5e36f43e773f457d2a99ff0df10'
Michael Niedermayer [Sun, 24 Feb 2013 12:15:52 +0000 (13:15 +0100)]
Merge commit '56daf10e0313c5e36f43e773f457d2a99ff0df10'

* commit '56daf10e0313c5e36f43e773f457d2a99ff0df10':
  mov: use the format context for logging.
  flicvideo: avoid an infinite loop in byte run compression

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/concatdec: add the "duration" directive.
Nicolas George [Wed, 13 Feb 2013 16:25:56 +0000 (17:25 +0100)]
lavf/concatdec: add the "duration" directive.

6 years agotools: add seek_print.
Nicolas George [Wed, 13 Feb 2013 18:15:45 +0000 (19:15 +0100)]
tools: add seek_print.

Useful for testing seek implementations.

6 years agoloco: check the last plane too
Michael Niedermayer [Sun, 24 Feb 2013 12:03:13 +0000 (13:03 +0100)]
loco: check the last plane too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '067432c1c95882c7221e694f33d9f3bdbe46de7f'
Michael Niedermayer [Sun, 24 Feb 2013 11:57:08 +0000 (12:57 +0100)]
Merge commit '067432c1c95882c7221e694f33d9f3bdbe46de7f'

* commit '067432c1c95882c7221e694f33d9f3bdbe46de7f':
  loco: check that there is data left after decoding a plane.
  lagarith: avoid infinite loop in lag_rac_refill()

Conflicts:
libavcodec/loco.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>