ffmpeg.git
6 years agoMerge commit 'e2c272eb3660d7f4f1d7720980e30f6a617e7eb3'
Michael Niedermayer [Thu, 28 Feb 2013 11:49:03 +0000 (12:49 +0100)]
Merge commit 'e2c272eb3660d7f4f1d7720980e30f6a617e7eb3'

* commit 'e2c272eb3660d7f4f1d7720980e30f6a617e7eb3':
  LICENSE: Move (L)GPLv3 explanation block to a more suitable place
  swscale: Add support for unscaled 8-bit Packed RGB -> Planar RGB

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoImprove dump_attachment documentation.
Carl Eugen Hoyos [Thu, 28 Feb 2013 07:57:10 +0000 (08:57 +0100)]
Improve dump_attachment documentation.

Fixes ticket #2299

6 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Thu, 28 Feb 2013 00:42:55 +0000 (01:42 +0100)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: do not cycle through unavailable show modes
  ffplay: add option to disable subtitling
  ffplay: use NAN to signal invalid external clock
  ffplay: if audio or video clock is invalid return NAN
  ffplay: allow frame dropping if we redisplay an already displayed frame
  ffplay: return true for pictq_prev_picture if it was successful
  ffplay: only quit from audio_decode_frame before decoding when paused
  ffplay: drop remaining frames in current audio avpacket when seeking
  ffplay: signal seek event to read thread

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoRevert "lavf/utils: add support for special characters encoding in URL"
Michael Niedermayer [Thu, 28 Feb 2013 00:25:16 +0000 (01:25 +0100)]
Revert "lavf/utils: add support for special characters encoding in URL"

This reverts commit 4a8fc1d83b1b55e1ac533644168018ebeec0c732.

The commit caused null pointer derefernces when using udp://
after i fixed that it caused ffmpeg to get stuck and remapped
arguments like ?ttl=255 -> ?ttl%3d255

I dont want to leave this broken thus temporary revert so we all
have some time to look at this without half the network protocols
being broken in the meantime

6 years agobuild: make iconv build configurable.
Clément Bœsch [Wed, 27 Feb 2013 23:45:51 +0000 (00:45 +0100)]
build: make iconv build configurable.

6 years agolavf/utils: add support for special characters encoding in URL
Senthilnathan M [Sun, 10 Feb 2013 17:38:52 +0000 (23:08 +0530)]
lavf/utils: add support for special characters encoding in URL

In particular, fix trac ticket #2031.

Signed-off-by: Senthilnathan M <senthilnathan.maadasamy@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agolavf/concatdec: define "ffcat" and "ffconcat" extensions
Stefano Sabatini [Thu, 21 Feb 2013 18:33:07 +0000 (19:33 +0100)]
lavf/concatdec: define "ffcat" and "ffconcat" extensions

6 years agoffplay: do not cycle through unavailable show modes
Marton Balint [Sat, 23 Feb 2013 01:15:06 +0000 (02:15 +0100)]
ffplay: do not cycle through unavailable show modes

Fixes ticket #2200.

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: add option to disable subtitling
Marton Balint [Sat, 23 Feb 2013 00:52:23 +0000 (01:52 +0100)]
ffplay: add option to disable subtitling

Fixes ticket #2201.

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: use NAN to signal invalid external clock
Marton Balint [Fri, 22 Feb 2013 17:18:00 +0000 (18:18 +0100)]
ffplay: use NAN to signal invalid external clock

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: if audio or video clock is invalid return NAN
Marton Balint [Sat, 16 Feb 2013 22:36:07 +0000 (23:36 +0100)]
ffplay: if audio or video clock is invalid return NAN

This helps us not to make bad decision (frame dropping, audio compensation)
right after seeking when we do not know yet the recent audio or video clock.

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: allow frame dropping if we redisplay an already displayed frame
Marton Balint [Sat, 16 Feb 2013 13:24:34 +0000 (14:24 +0100)]
ffplay: allow frame dropping if we redisplay an already displayed frame

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: return true for pictq_prev_picture if it was successful
Marton Balint [Sat, 9 Feb 2013 23:29:29 +0000 (00:29 +0100)]
ffplay: return true for pictq_prev_picture if it was successful

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: only quit from audio_decode_frame before decoding when paused
Marton Balint [Sat, 16 Feb 2013 19:56:19 +0000 (20:56 +0100)]
ffplay: only quit from audio_decode_frame before decoding when paused

This way the audio clock is updated to a proper value even when the video is
paused.

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: drop remaining frames in current audio avpacket when seeking
Marton Balint [Sat, 16 Feb 2013 19:53:07 +0000 (20:53 +0100)]
ffplay: drop remaining frames in current audio avpacket when seeking

Fixes ticket #1928.

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: signal seek event to read thread
Marton Balint [Sat, 16 Feb 2013 19:21:13 +0000 (20:21 +0100)]
ffplay: signal seek event to read thread

Improves seek delay.

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agobuild: fix iconv detection on some systems.
Clément Bœsch [Wed, 27 Feb 2013 19:58:48 +0000 (20:58 +0100)]
build: fix iconv detection on some systems.

This at least fix the build on CentOS.

6 years agoLICENSE: Move (L)GPLv3 explanation block to a more suitable place
Diego Biurrun [Wed, 27 Feb 2013 18:34:14 +0000 (19:34 +0100)]
LICENSE: Move (L)GPLv3 explanation block to a more suitable place

6 years agolavc/libopusenc: report an error if global_quality is set.
Nicolas George [Wed, 13 Feb 2013 11:16:47 +0000 (12:16 +0100)]
lavc/libopusenc: report an error if global_quality is set.

6 years agoffmpeg: free last sub when using -fix_sub_duration.
Nicolas George [Wed, 6 Feb 2013 14:00:38 +0000 (15:00 +0100)]
ffmpeg: free last sub when using -fix_sub_duration.

Fix trac ticket #2242.

Note: under valid circumstances, when using -fix_sub_duration,
the last subtitle is a dummy termination packet, with no
allocated memory.

6 years agoMerge remote-tracking branch 'fredjean/master'
Michael Niedermayer [Wed, 27 Feb 2013 17:26:12 +0000 (18:26 +0100)]
Merge remote-tracking branch 'fredjean/master'

* fredjean/master:
  Include fix for building ismindex under MinGW

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoInclude fix for building ismindex under MinGW
Frederic Jean [Wed, 27 Feb 2013 17:13:09 +0000 (10:13 -0700)]
Include fix for building ismindex under MinGW

Include cmdutils.h so we can build under windows.

Based on fix for https://ffmpeg.org/trac/ffmpeg/ticket/256

6 years agoexr: simplify decompression path
Paul B Mahol [Wed, 27 Feb 2013 16:22:14 +0000 (16:22 +0000)]
exr: simplify decompression path

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agodv: Correctly identify CDVC profile
Michael Niedermayer [Wed, 27 Feb 2013 16:19:51 +0000 (17:19 +0100)]
dv: Correctly identify CDVC profile

Fixes Ticket2177

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovf_lut: correct color/comp permutation
Michael Niedermayer [Wed, 27 Feb 2013 16:08:50 +0000 (17:08 +0100)]
vf_lut: correct color/comp permutation

Fixes Ticket2225

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswscale: Add support for unscaled 8-bit Packed RGB -> Planar RGB
Derek Buitenhuis [Sat, 22 Sep 2012 01:34:17 +0000 (01:34 +0000)]
swscale: Add support for unscaled 8-bit Packed RGB -> Planar RGB

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoswscale: Add support for unscaled 8-bit Packed RGB -> Planar RGB
Derek Buitenhuis [Sat, 22 Sep 2012 01:34:17 +0000 (01:34 +0000)]
swscale: Add support for unscaled 8-bit Packed RGB -> Planar RGB

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
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>