ffmpeg.git
7 years agoMerge commit '77b2cd7b41d7ec8008b6fac753c04f77824c514c'
Michael Niedermayer [Fri, 8 Mar 2013 19:41:41 +0000 (20:41 +0100)]
Merge commit '77b2cd7b41d7ec8008b6fac753c04f77824c514c'

* commit '77b2cd7b41d7ec8008b6fac753c04f77824c514c':
  AVFrame: add side data.

Conflicts:
libavutil/frame.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e'
Michael Niedermayer [Fri, 8 Mar 2013 19:18:45 +0000 (20:18 +0100)]
Merge commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e'

* commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e':
  Move AVFrame from lavc to lavu.

Conflicts:
libavcodec/avcodec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'ad0c9f2d5d81e22207c6ccecc426bf7306acc327'
Michael Niedermayer [Fri, 8 Mar 2013 18:35:37 +0000 (19:35 +0100)]
Merge commit 'ad0c9f2d5d81e22207c6ccecc426bf7306acc327'

* commit 'ad0c9f2d5d81e22207c6ccecc426bf7306acc327':
  lavc: move AVFrame.hwaccel_picture_private to Picture.

Conflicts:
libavcodec/avcodec.h
libavcodec/mpegvideo.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '1a5e9130162b8adc898e5f6aea82b6372d1e4e6c'
Michael Niedermayer [Fri, 8 Mar 2013 18:17:31 +0000 (19:17 +0100)]
Merge commit '1a5e9130162b8adc898e5f6aea82b6372d1e4e6c'

* commit '1a5e9130162b8adc898e5f6aea82b6372d1e4e6c':
  pthread: avoid copying input packets when possible.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '1afddbe59e96af75f1c07605afc95615569f388f'
Michael Niedermayer [Fri, 8 Mar 2013 16:28:42 +0000 (17:28 +0100)]
Merge commit '1afddbe59e96af75f1c07605afc95615569f388f'

* commit '1afddbe59e96af75f1c07605afc95615569f388f':
  avpacket: use AVBuffer to allow refcounting the packets.

Conflicts:
libavcodec/avpacket.c
libavcodec/utils.c
libavdevice/v4l2.c
libavformat/avidec.c
libavformat/flacdec.c
libavformat/id3v2.c
libavformat/matroskaenc.c
libavformat/mux.c
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '1cec0624d0e6f48590283a57169b58b9fe8449d3'
Michael Niedermayer [Fri, 8 Mar 2013 15:05:59 +0000 (16:05 +0100)]
Merge commit '1cec0624d0e6f48590283a57169b58b9fe8449d3'

* commit '1cec0624d0e6f48590283a57169b58b9fe8449d3':
  AVBuffer: add a new API for buffer pools

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '8e401dbe90cc77b1f3067a917d9fa48cefa3fcdb'
Michael Niedermayer [Fri, 8 Mar 2013 15:01:00 +0000 (16:01 +0100)]
Merge commit '8e401dbe90cc77b1f3067a917d9fa48cefa3fcdb'

* commit '8e401dbe90cc77b1f3067a917d9fa48cefa3fcdb':
  lavu: add a new API for reference-counted data buffers.

Conflicts:
libavutil/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '65f1d45dcc71186ede72fff950996099d23359bd'
Michael Niedermayer [Fri, 8 Mar 2013 14:47:06 +0000 (15:47 +0100)]
Merge commit '65f1d45dcc71186ede72fff950996099d23359bd'

* commit '65f1d45dcc71186ede72fff950996099d23359bd':
  lavu: add support for atomic operations.

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'eae0879d961b78717dd2a0899809ad22819ae9e3'
Michael Niedermayer [Fri, 8 Mar 2013 14:42:32 +0000 (15:42 +0100)]
Merge commit 'eae0879d961b78717dd2a0899809ad22819ae9e3'

* commit 'eae0879d961b78717dd2a0899809ad22819ae9e3':
  mp3dec: Fix VBR bit rate parsing

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '4be368b504c6f4a03051448728fc62cd0ed506b2'
Michael Niedermayer [Fri, 8 Mar 2013 14:37:00 +0000 (15:37 +0100)]
Merge commit '4be368b504c6f4a03051448728fc62cd0ed506b2'

* commit '4be368b504c6f4a03051448728fc62cd0ed506b2':
  avstring: Fix isxdigit to not accept non-hex characters
  configure: Add missing videodsp dependencies to some decoders

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'dbd2a34ba5e5e46b6835e4425c360723c643b7a8'
Michael Niedermayer [Fri, 8 Mar 2013 14:32:39 +0000 (15:32 +0100)]
Merge commit 'dbd2a34ba5e5e46b6835e4425c360723c643b7a8'

* commit 'dbd2a34ba5e5e46b6835e4425c360723c643b7a8':
  build: cosmetics: Group hw accelerator Makefile entries together

Conflicts:
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'bcd0a7137e4aca0f6f598593b90ca8f338444c51'
Michael Niedermayer [Fri, 8 Mar 2013 14:23:56 +0000 (15:23 +0100)]
Merge commit 'bcd0a7137e4aca0f6f598593b90ca8f338444c51'

* commit 'bcd0a7137e4aca0f6f598593b90ca8f338444c51':
  configure: Add missing h264chroma dependencies to vp5, vp6
  Add missing error_resilience includes to files that use ER

Conflicts:
configure
libavcodec/mpeg12.c
libavcodec/mpeg4videodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'd88738e4038b162708dc2f5342e10c1694edfd89'
Michael Niedermayer [Fri, 8 Mar 2013 14:17:15 +0000 (15:17 +0100)]
Merge commit 'd88738e4038b162708dc2f5342e10c1694edfd89'

* commit 'd88738e4038b162708dc2f5342e10c1694edfd89':
  mpegvideo: Conditionally build error_resilience bits

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '06b54e84254e4834b4978ff5b27cc2b7ee8d7a98'
Michael Niedermayer [Fri, 8 Mar 2013 14:05:18 +0000 (15:05 +0100)]
Merge commit '06b54e84254e4834b4978ff5b27cc2b7ee8d7a98'

* commit '06b54e84254e4834b4978ff5b27cc2b7ee8d7a98':
  build: Fix error_resilience code dependencies

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'efa7f4202088c70caba11d7834641bc6eaf41830'
Michael Niedermayer [Fri, 8 Mar 2013 13:57:41 +0000 (14:57 +0100)]
Merge commit 'efa7f4202088c70caba11d7834641bc6eaf41830'

* commit 'efa7f4202088c70caba11d7834641bc6eaf41830':
  Use the avstring.h locale-independent character type functions
  avstring: Add locale independent versions of some ctype.h functions

Conflicts:
avprobe.c
doc/APIchanges
libavcodec/dvdsubdec.c
libavcodec/utils.c
libavutil/avstring.c
libavutil/avstring.h
libavutil/eval.c
libavutil/parseutils.c
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMAINTAINERS: update for 1.2 n1.3-dev
Michael Niedermayer [Fri, 8 Mar 2013 13:45:26 +0000 (14:45 +0100)]
MAINTAINERS: update for 1.2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoRevert "aacdec: Reconfigure output as needed, disable pop_output_configuration()"
Michael Niedermayer [Fri, 8 Mar 2013 13:07:36 +0000 (14:07 +0100)]
Revert "aacdec: Reconfigure output as needed, disable pop_output_configuration()"

This reverts commit 60dbf2eff92f8aa4683b6dcaba9e694890258ade.

This is not needed anymore, Ticket 1694 has been fixed differently

7 years agoaacsbr: Check for envelope scalefactors overflowing
Michael Niedermayer [Fri, 8 Mar 2013 13:00:22 +0000 (14:00 +0100)]
aacsbr: Check for envelope scalefactors overflowing

This prevents various values from becoming stuck at NAN and
output to become silent
If someone knows a cleaner solution, thats welcome!

Fixes Ticket2335

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoAVFrame: add side data.
Anton Khirnov [Tue, 25 Dec 2012 21:11:36 +0000 (22:11 +0100)]
AVFrame: add side data.

7 years agoMove AVFrame from lavc to lavu.
Anton Khirnov [Wed, 17 Oct 2012 09:51:01 +0000 (11:51 +0200)]
Move AVFrame from lavc to lavu.

Add AVBuffer-based reference counting API to it.

7 years agolavc: move AVFrame.hwaccel_picture_private to Picture.
Anton Khirnov [Mon, 8 Oct 2012 05:50:14 +0000 (07:50 +0200)]
lavc: move AVFrame.hwaccel_picture_private to Picture.

This field is private and should not be present in a public struct. It
is only used in DXVA with mpegvideo-based decoders currently.

7 years agopthread: avoid copying input packets when possible.
Anton Khirnov [Wed, 31 Oct 2012 15:36:07 +0000 (16:36 +0100)]
pthread: avoid copying input packets when possible.

7 years agoavpacket: use AVBuffer to allow refcounting the packets.
Anton Khirnov [Wed, 31 Oct 2012 07:53:18 +0000 (08:53 +0100)]
avpacket: use AVBuffer to allow refcounting the packets.

This will allow us to avoid copying the packets in many cases.

This breaks ABI.

7 years agoAVBuffer: add a new API for buffer pools
Anton Khirnov [Sun, 20 Jan 2013 07:03:13 +0000 (08:03 +0100)]
AVBuffer: add a new API for buffer pools

7 years agolavu: add a new API for reference-counted data buffers.
Anton Khirnov [Sun, 7 Oct 2012 13:45:44 +0000 (15:45 +0200)]
lavu: add a new API for reference-counted data buffers.

7 years agolavu: add support for atomic operations.
Ronald S. Bultje [Sun, 2 Dec 2012 22:34:50 +0000 (14:34 -0800)]
lavu: add support for atomic operations.

These could be used for reference counting, or for keeping track of
decoding progress in references in multithreaded decoders.

Support is provided by gcc/msvc/suncc intrinsics, with a fallback using
pthread mutexes.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agomp3dec: Fix VBR bit rate parsing
Alexander Kojevnikov [Thu, 7 Mar 2013 05:38:55 +0000 (21:38 -0800)]
mp3dec: Fix VBR bit rate parsing

When parsing the Xing/Info tag, don't set the bit rate if it's an Info tag.

When parsing the stream, don't override the bit rate if it's already set,
otherwise calculate the mean bit rate from parsed frames. This way, the bit
rate will be set correctly both for CBR and VBR streams.

CC:libav-stable@libav.org

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agoClose output codecs if input codec initialisation fails.
Carl Eugen Hoyos [Fri, 8 Mar 2013 01:46:46 +0000 (02:46 +0100)]
Close output codecs if input codec initialisation fails.

Fixes ticket #1546 and the remaining part of ticket #1244.

7 years agoAdd dependencies for the voice fate tests.
Carl Eugen Hoyos [Fri, 8 Mar 2013 01:45:27 +0000 (02:45 +0100)]
Add dependencies for the voice fate tests.

7 years agoAdd dependencies for the flac encoding fate tests.
Carl Eugen Hoyos [Fri, 8 Mar 2013 01:44:46 +0000 (02:44 +0100)]
Add dependencies for the flac encoding fate tests.

7 years agoAdd dependencies for the aac encoding fate tests.
Carl Eugen Hoyos [Fri, 8 Mar 2013 01:44:07 +0000 (02:44 +0100)]
Add dependencies for the aac encoding fate tests.

7 years agoForce using a 64bit intermediate when calculating calendar time with av_timegm().
Carl Eugen Hoyos [Fri, 8 Mar 2013 01:42:33 +0000 (02:42 +0100)]
Force using a 64bit intermediate when calculating calendar time with av_timegm().

Fixes a fate failure with icc 13.1

7 years agompegaudio_parser: Don't ignore information from the first frame
Alexander Kojevnikov [Thu, 7 Mar 2013 05:58:59 +0000 (21:58 -0800)]
mpegaudio_parser: Don't ignore information from the first frame

Signed-off-by: Alexander Kojevnikov <alexander@kojevnikov.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoaacdec: Reconfigure output as needed, disable pop_output_configuration()
Michael Niedermayer [Fri, 22 Feb 2013 23:47:38 +0000 (00:47 +0100)]
aacdec: Reconfigure output as needed, disable pop_output_configuration()

Fixes Ticket1694

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopsymodel: dont apply lowpass filters with a cutoff close to the nyquist
Michael Niedermayer [Thu, 7 Mar 2013 18:28:30 +0000 (19:28 +0100)]
psymodel: dont apply lowpass filters with a cutoff close to the nyquist

The IIR filter numerically diverges in such cases, this could easily be
fixed but would make the filter slower on some platforms

Fixes Ticket2246

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavstring: Fix isxdigit to not accept non-hex characters
Martin Storsjö [Thu, 7 Mar 2013 13:21:03 +0000 (15:21 +0200)]
avstring: Fix isxdigit to not accept non-hex characters

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoconfigure: Add missing videodsp dependencies to some decoders
Diego Biurrun [Thu, 7 Mar 2013 14:20:54 +0000 (15:20 +0100)]
configure: Add missing videodsp dependencies to some decoders

7 years agobuild: cosmetics: Group hw accelerator Makefile entries together
Diego Biurrun [Thu, 7 Mar 2013 13:57:30 +0000 (14:57 +0100)]
build: cosmetics: Group hw accelerator Makefile entries together

7 years agoconfigure: Add missing h264chroma dependencies to vp5, vp6
Diego Biurrun [Wed, 6 Mar 2013 18:30:25 +0000 (19:30 +0100)]
configure: Add missing h264chroma dependencies to vp5, vp6

7 years agompegvideo: Conditionally build error_resilience bits
Martin Storsjö [Wed, 6 Mar 2013 17:28:49 +0000 (18:28 +0100)]
mpegvideo: Conditionally build error_resilience bits

This breaks the dependency of mpegvideo on error_resilience allowing
compilation of components that depend on the former w/o the latter.

7 years agobuild: Fix error_resilience code dependencies
Diego Biurrun [Wed, 6 Mar 2013 16:32:31 +0000 (17:32 +0100)]
build: Fix error_resilience code dependencies

7 years agoAdd missing error_resilience includes to files that use ER
Diego Biurrun [Wed, 6 Mar 2013 17:31:14 +0000 (18:31 +0100)]
Add missing error_resilience includes to files that use ER

7 years agoUse the avstring.h locale-independent character type functions
Reimar Döffinger [Sun, 3 Mar 2013 10:17:50 +0000 (11:17 +0100)]
Use the avstring.h locale-independent character type functions

Make sure the behavior does not change with the locale.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoavstring: Add locale independent versions of some ctype.h functions
Reimar Döffinger [Wed, 6 Mar 2013 12:00:22 +0000 (14:00 +0200)]
avstring: Add locale independent versions of some ctype.h functions

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoavformat: Fix apics with aac
Michael Niedermayer [Thu, 7 Mar 2013 12:55:43 +0000 (13:55 +0100)]
avformat: Fix apics with aac

Fixes Ticket2318

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agohls: fix timebase
Michael Niedermayer [Thu, 7 Mar 2013 12:42:12 +0000 (13:42 +0100)]
hls: fix timebase

Fixes Ticket1733

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 7 Mar 2013 10:50:17 +0000 (11:50 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavc: Deprecate the deinterlace functions in libavcodec
  h264: Integrate draw_horiz_band into ff_h264_draw_horiz_band

Conflicts:
configure
ffmpeg_opt.c
libavcodec/avcodec.h
libavcodec/h264.c
libavcodec/imgconvert.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '70762508ec5919474edb92a5b1f266fd06640f9c'
Michael Niedermayer [Thu, 7 Mar 2013 10:29:11 +0000 (11:29 +0100)]
Merge commit '70762508ec5919474edb92a5b1f266fd06640f9c'

* commit '70762508ec5919474edb92a5b1f266fd06640f9c':
  lavc: Prettify printing of codec tags containing non alphanumeric characters
  h264: Rename the jpeg_420 pixfmt list to match the common naming structure

Conflicts:
libavcodec/h264.c
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc: Deprecate the deinterlace functions in libavcodec
Ronald S. Bultje [Sun, 3 Mar 2013 16:23:08 +0000 (08:23 -0800)]
lavc: Deprecate the deinterlace functions in libavcodec

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoh264: Integrate draw_horiz_band into ff_h264_draw_horiz_band
Ronald S. Bultje [Sat, 2 Mar 2013 19:22:02 +0000 (11:22 -0800)]
h264: Integrate draw_horiz_band into ff_h264_draw_horiz_band

This makes the decoder independent of mpegvideo.

This copy of the draw_horiz_band code is simplified compared to
the "generic" mpegvideo one which still has a number of special
cases for different codecs.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agolavc: Prettify printing of codec tags containing non alphanumeric characters
Stefano Sabatini [Fri, 25 May 2012 23:38:03 +0000 (01:38 +0200)]
lavc: Prettify printing of codec tags containing non alphanumeric characters

Make av_get_codec_tag_string() show codec tag string characters in a more
intelligible ways. For example the ascii char "@" is used as a number, so
should be displayed like "[64]" rather than as a printable character.

Apart alphanumeric chars, only the characters ' ' and '.' are used
literally in codec tags, all the other characters represent numbers.

This also avoids relying on locale-dependent character class functions.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoh264: Rename the jpeg_420 pixfmt list to match the common naming structure
Martin Storsjö [Wed, 6 Mar 2013 19:18:00 +0000 (21:18 +0200)]
h264: Rename the jpeg_420 pixfmt list to match the common naming structure

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agolibavcodec: changed mathematical functions in aacpsy.c
Bojan Zivkovic [Wed, 6 Mar 2013 13:55:03 +0000 (14:55 +0100)]
libavcodec: changed mathematical functions in aacpsy.c

This patch changes existing mathematical functions with faster
ones. Speeds up encoding more than 10%. Tested on x86 and
MIPS platforms.

Signed-off-by: Bojan Zivkovic <bojan@mips.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf/segment: add support to ffconcat segment list
Stefano Sabatini [Thu, 21 Feb 2013 18:33:26 +0000 (19:33 +0100)]
lavf/segment: add support to ffconcat segment list

7 years agodoc/texi2pod: fix @ref substitution rule, disallow "}" within the fields
Stefano Sabatini [Thu, 7 Mar 2013 00:43:39 +0000 (01:43 +0100)]
doc/texi2pod: fix @ref substitution rule, disallow "}" within the fields

Fix potential spurious substitution.

7 years agolavu: add escape API
Stefano Sabatini [Sun, 16 Dec 2012 11:17:23 +0000 (12:17 +0100)]
lavu: add escape API

The escape API will be useful to perform escaping programmatically, which
is required when crafting argument strings, and will be used for context
printing as well.

This is based on the ffescape tool code, with a few extensions and fixes.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 6 Mar 2013 23:27:53 +0000 (00:27 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avconv: Make sure the encoder exists before inspecting supported_list

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '5da51284937649a8ebb84fa951c235438fcbf8ae'
Michael Niedermayer [Wed, 6 Mar 2013 23:18:22 +0000 (00:18 +0100)]
Merge commit '5da51284937649a8ebb84fa951c235438fcbf8ae'

* commit '5da51284937649a8ebb84fa951c235438fcbf8ae':
  cavs: Add a dependency on h264chroma
  lavc: Split out ff_hwaccel_pixfmt_list_420[] over individual codecs

Conflicts:
libavcodec/h263dec.c
libavcodec/h264.c
libavcodec/mpeg12.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '5a4e9fe855282a99586050a507d0a486ad39df5b'
Michael Niedermayer [Wed, 6 Mar 2013 22:56:07 +0000 (23:56 +0100)]
Merge commit '5a4e9fe855282a99586050a507d0a486ad39df5b'

* commit '5a4e9fe855282a99586050a507d0a486ad39df5b':
  avcodec/internal: Fix #if DECODE_AUDIO / ENCODE_AUDIO name mismatch
  shorten: use the unsigned type where needed

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '4c364eb2b856fc33cf7b42f7c7b979e69fde5f3a'
Michael Niedermayer [Wed, 6 Mar 2013 22:47:10 +0000 (23:47 +0100)]
Merge commit '4c364eb2b856fc33cf7b42f7c7b979e69fde5f3a'

* commit '4c364eb2b856fc33cf7b42f7c7b979e69fde5f3a':
  shorten: report meaningful errors

Conflicts:
libavcodec/shorten.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'a2ad554def214d2d03b7c16f68dc081a8622f9ca'
Michael Niedermayer [Wed, 6 Mar 2013 22:39:52 +0000 (23:39 +0100)]
Merge commit 'a2ad554def214d2d03b7c16f68dc081a8622f9ca'

* commit 'a2ad554def214d2d03b7c16f68dc081a8622f9ca':
  shorten: K&R formatting cosmetics

Conflicts:
libavcodec/shorten.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'c10da30d8426a1f681d99a780b6e311f7fb4e5c5'
Michael Niedermayer [Wed, 6 Mar 2013 22:27:09 +0000 (23:27 +0100)]
Merge commit 'c10da30d8426a1f681d99a780b6e311f7fb4e5c5'

* commit 'c10da30d8426a1f681d99a780b6e311f7fb4e5c5':
  shorten: set invalid channels count to 0
  vorbisdec: check memory allocations
  h264: check for luma and chroma bit dept being equal

Conflicts:
libavcodec/shorten.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agonormalize calls to ff_alloc_packet2
James Zern [Wed, 6 Mar 2013 19:11:00 +0000 (11:11 -0800)]
normalize calls to ff_alloc_packet2

- check ret < 0
- remove excessive error log

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavconv: Make sure the encoder exists before inspecting supported_list
Martin Storsjö [Wed, 6 Mar 2013 13:01:36 +0000 (15:01 +0200)]
avconv: Make sure the encoder exists before inspecting supported_list

This fixes crashes when there is no encoder for the default codec of
selected format.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agocavs: Add a dependency on h264chroma
Carl Eugen Hoyos [Mon, 4 Mar 2013 10:43:55 +0000 (11:43 +0100)]
cavs: Add a dependency on h264chroma

This fixes standalone building of this decoder.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agolavc: Split out ff_hwaccel_pixfmt_list_420[] over individual codecs
Ronald S. Bultje [Mon, 18 Feb 2013 16:15:52 +0000 (08:15 -0800)]
lavc: Split out ff_hwaccel_pixfmt_list_420[] over individual codecs

Not all hwaccels implement all codecs, so using one single list for
multiple such codecs means some codecs will be represented in the list,
even though they don't actually handle that codec. Copying specific
lists in each codec fixes that.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoMove ff_cropTbl and ff_zigzag_direct from dsputil to mathtables.
Ronald S. Bultje [Sun, 3 Mar 2013 23:47:11 +0000 (15:47 -0800)]
Move ff_cropTbl and ff_zigzag_direct from dsputil to mathtables.

These are widely used throughout libavcodec, nothing dsputil-specific.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosnowenc: fix indention
Michael Niedermayer [Wed, 6 Mar 2013 18:26:56 +0000 (19:26 +0100)]
snowenc: fix indention

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosnowenc: add forgotten emms_c()
Michael Niedermayer [Wed, 6 Mar 2013 18:26:40 +0000 (19:26 +0100)]
snowenc: add forgotten emms_c()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf/concat: document the use of the files durations.
Nicolas George [Tue, 5 Mar 2013 16:14:27 +0000 (17:14 +0100)]
lavf/concat: document the use of the files durations.

Address trac ticket #2319.

7 years agoavcodec/internal: Fix #if DECODE_AUDIO / ENCODE_AUDIO name mismatch
Diego Biurrun [Tue, 5 Mar 2013 10:57:51 +0000 (11:57 +0100)]
avcodec/internal: Fix #if DECODE_AUDIO / ENCODE_AUDIO name mismatch

7 years agosnowenc: initialize edges
Michael Niedermayer [Wed, 6 Mar 2013 15:35:47 +0000 (16:35 +0100)]
snowenc: initialize edges

This fixes a regression caused by changes to the buffer initialization code.
Fixes valgrind warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovc1dec: use av_log_ask_for_sample for odd sprites
Michael Niedermayer [Wed, 6 Mar 2013 12:45:53 +0000 (13:45 +0100)]
vc1dec: use av_log_ask_for_sample for odd sprites

Suggested-by: Reimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibilbc: use ff_alloc_packet2
Paul B Mahol [Wed, 6 Mar 2013 10:42:10 +0000 (10:42 +0000)]
libilbc: use ff_alloc_packet2

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolibopusenc: use ff_alloc_packet2
James Zern [Tue, 5 Mar 2013 21:19:03 +0000 (13:19 -0800)]
libopusenc: use ff_alloc_packet2

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 6 Mar 2013 09:34:14 +0000 (10:34 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  hwaccel: consistent name prefixes for start_frame/end_frame/decode_slice

Conflicts:
libavcodec/vda_h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Wed, 6 Mar 2013 04:37:09 +0000 (05:37 +0100)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Move the iconv test to the bottom of configure.
  Make 32bit zmbv colour-space opaque.
  Use uint8_t instead of uint16_t pointer in kega decoder.
  kgv1dec: Simplify kega decoding by using memcpy instead of loops

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoqdm2: check "AC" codewords
Michael Niedermayer [Wed, 6 Mar 2013 04:04:15 +0000 (05:04 +0100)]
qdm2: check "AC" codewords

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoqdm2: simplify arithmetic coder tables generation
Michael Niedermayer [Wed, 6 Mar 2013 03:56:33 +0000 (04:56 +0100)]
qdm2: simplify arithmetic coder tables generation

Someone should rename the variables, theres nothing random in there

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agorv20: Fix handling of frame skip.
Michael Niedermayer [Wed, 6 Mar 2013 02:10:18 +0000 (03:10 +0100)]
rv20: Fix handling of frame skip.

Fixes division by zero

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomss2dsp/upsample_plane: fix 0x0 handling
Michael Niedermayer [Wed, 6 Mar 2013 00:37:49 +0000 (01:37 +0100)]
mss2dsp/upsample_plane: fix 0x0 handling

Fixes invalid memcpy and out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoshorten: report meaningful errors
Luca Barbato [Tue, 5 Mar 2013 15:34:16 +0000 (16:34 +0100)]
shorten: report meaningful errors

7 years agoshorten: K&R formatting cosmetics
Luca Barbato [Tue, 5 Mar 2013 15:11:28 +0000 (16:11 +0100)]
shorten: K&R formatting cosmetics

7 years agoshorten: use the unsigned type where needed
Luca Barbato [Tue, 5 Mar 2013 16:12:35 +0000 (17:12 +0100)]
shorten: use the unsigned type where needed

get_uint returns an unsigned value, use an unsigned to store
blocksize to make sure the comparison logic is correct and report
correctly the error for the channel count not supported.

7 years agoshorten: set invalid channels count to 0
Michael Niedermayer [Tue, 5 Mar 2013 14:13:04 +0000 (15:13 +0100)]
shorten: set invalid channels count to 0

Prevent the loop shorten_decode_close from writing and freeing out of
the array boundary.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agovorbisdec: check memory allocations
Luca Barbato [Mon, 4 Mar 2013 18:42:48 +0000 (19:42 +0100)]
vorbisdec: check memory allocations

7 years agoMove the iconv test to the bottom of configure.
Carl Eugen Hoyos [Tue, 5 Mar 2013 23:57:51 +0000 (00:57 +0100)]
Move the iconv test to the bottom of configure.

This fixes a possible mis-detection of iconv on OS X.
OS X with macports often has two version of libiconv.2.dylib
installed, one with symbols like "_iconv_open" and one with
"_libiconv_open", so test for iconv with all flags to make
sure the detection uses the same library as the actual
compilation / linking.

Tested-by: Paul Sturbaum
7 years agoMake 32bit zmbv colour-space opaque.
Carl Eugen Hoyos [Tue, 5 Mar 2013 23:38:12 +0000 (00:38 +0100)]
Make 32bit zmbv colour-space opaque.

7 years agoUse uint8_t instead of uint16_t pointer in kega decoder.
Carl Eugen Hoyos [Tue, 5 Mar 2013 23:35:08 +0000 (00:35 +0100)]
Use uint8_t instead of uint16_t pointer in kega decoder.

This change allows to remove a few casts and avoids
a potential pointer aliasing violation.

7 years agokgv1dec: Simplify kega decoding by using memcpy instead of loops
Reimar Döffinger [Tue, 5 Mar 2013 23:25:18 +0000 (00:25 +0100)]
kgv1dec: Simplify kega decoding by using memcpy instead of loops

Fixes decoding errors with icc 13.1

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
7 years agovc1dec: odd sized sprites are unsupported
Michael Niedermayer [Tue, 5 Mar 2013 23:03:58 +0000 (00:03 +0100)]
vc1dec: odd sized sprites are unsupported

It should be easy to add support but without a sample we would
not know if they work.

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoasfdec: dont truncate type 2-5 values
Michael Niedermayer [Tue, 5 Mar 2013 20:56:46 +0000 (21:56 +0100)]
asfdec: dont truncate type 2-5 values

Fixes use of uninitialized variables and possible out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovf_stereo3d: Add AVOption table terminator
Michael Niedermayer [Tue, 5 Mar 2013 21:29:17 +0000 (22:29 +0100)]
vf_stereo3d: Add AVOption table terminator

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: check for luma and chroma bit dept being equal
Luca Barbato [Mon, 4 Mar 2013 10:21:08 +0000 (11:21 +0100)]
h264: check for luma and chroma bit dept being equal

The decoder assumes a single bit depth for all the planes
while the specification allows different bit depths for luma
and chroma.

Avoid the possible problems described in CVE-2013-2277

CC: libav-stable@libav.org
7 years agolavfi/deshake: support named options.
Clément Bœsch [Tue, 5 Mar 2013 19:16:51 +0000 (20:16 +0100)]
lavfi/deshake: support named options.

7 years agodoc/filters: make examples a bit more consistent.
Clément Bœsch [Tue, 5 Mar 2013 20:08:16 +0000 (21:08 +0100)]
doc/filters: make examples a bit more consistent.

Create dedicated subsection and itemize. Not done for every filters, but
a large part is done.

7 years agodoc/showspectrum: add some examples.
Clément Bœsch [Tue, 5 Mar 2013 19:37:58 +0000 (20:37 +0100)]
doc/showspectrum: add some examples.

7 years agolavfi/overlay: improve log message warning in case of clipped overlay
Stefano Sabatini [Tue, 19 Feb 2013 18:03:30 +0000 (19:03 +0100)]
lavfi/overlay: improve log message warning in case of clipped overlay

7 years agolavfi/overlay: add support for partial overlaying
Stefano Sabatini [Tue, 5 Mar 2013 18:38:15 +0000 (19:38 +0100)]
lavfi/overlay: add support for partial overlaying

Partially rework the iteration logic, in order to limit iteration only
for the clipped overlay region.

7 years agolavfi/mp: drop mp=stereo3d filter
Paul B Mahol [Tue, 5 Mar 2013 18:45:35 +0000 (18:45 +0000)]
lavfi/mp: drop mp=stereo3d filter

The filter has been natively integrated into libavfilter.

Signed-off-by: Paul B Mahol <onemda@gmail.com>