ffmpeg.git
8 years agoMerge commit 'd05f72c75445969cd7bdb1d860635c9880c67fb6'
Michael Niedermayer [Sun, 30 Sep 2012 11:52:48 +0000 (13:52 +0200)]
Merge commit 'd05f72c75445969cd7bdb1d860635c9880c67fb6'

* commit 'd05f72c75445969cd7bdb1d860635c9880c67fb6':
  dfa: improve boundary checks in decode_dds1()
  wmalosslessdec: Fix reading too many bits in decode_channel_residues()
  wmalosslessdec: fix a get_bits(0) in decode_ac_filter
  wmalosslessdec: make MCLMS arrays big enough for what is written into them.
  indeo4/5: check empty tile size in decode_mb_info().
  ivi_common: make ff_ivi_process_empty_tile() static.
  indeo5: check tile size in decode_mb_info().
  indeo3: fix out of cell write.

Conflicts:
libavcodec/dfa.c
libavcodec/indeo3.c
libavcodec/indeo5.c
libavcodec/ivi_common.c
libavcodec/wmalosslessdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffprobe: extend disposition printing support
Stefano Sabatini [Wed, 26 Sep 2012 10:30:08 +0000 (12:30 +0200)]
ffprobe: extend disposition printing support

This generalizes the previous work on disposition printing.

Disposition flags are shown in a dedicated section, which should improve
output intellegibility, extensibility and filtering operations.

This breaks output syntax with the recently introduced disposition
printing.

8 years agoffprobe: generalize nesting model for the XML writer
Stefano Sabatini [Fri, 28 Sep 2012 16:57:47 +0000 (18:57 +0200)]
ffprobe: generalize nesting model for the XML writer

Do not make use of ad-hoc "tags" code, introduce a new section flag
SECTION_FLAG_HAS_VARIABLE_FIELDS to deal with the tags in a
content-agnostic way.

This is required by the pending disposition change.

8 years agolavu/opt: cosmetic fixes forgotten in the previous patch.
Nicolas George [Sun, 30 Sep 2012 08:23:08 +0000 (10:23 +0200)]
lavu/opt: cosmetic fixes forgotten in the previous patch.

8 years agoopt: implement av_opt_set_from_string().
Nicolas George [Mon, 13 Aug 2012 14:39:56 +0000 (16:39 +0200)]
opt: implement av_opt_set_from_string().

It is similar to av_set_options_string() but accepts a list
of options that can be in shorthand: if the key is omitted
on the first fields, the keys from the shorthand list are
assumed, in order.

8 years agoget_bits_long: fix variable type
Michael Niedermayer [Sun, 30 Sep 2012 00:37:40 +0000 (02:37 +0200)]
get_bits_long: fix variable type

This fixes a theoretical signed overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agocyuv: implement raw cyuv
Michael Niedermayer [Sat, 29 Sep 2012 21:58:50 +0000 (23:58 +0200)]
cyuv: implement raw cyuv

Fixes Ticket1620

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodoc/fate: Move fate config example into doc subdirectory
Alexander Strasser [Sat, 15 Sep 2012 21:34:21 +0000 (23:34 +0200)]
doc/fate: Move fate config example into doc subdirectory

Be compatible with texi2html 5.0 which doesn't search relative
file names in search paths anymore.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
8 years agodfa: improve boundary checks in decode_dds1()
Anton Khirnov [Sat, 29 Sep 2012 11:25:28 +0000 (13:25 +0200)]
dfa: improve boundary checks in decode_dds1()

Fixes CVE-2012-2798

CC:libav-stable@libav.org

8 years agowmalosslessdec: Fix reading too many bits in decode_channel_residues()
Anton Khirnov [Sat, 29 Sep 2012 17:16:32 +0000 (19:16 +0200)]
wmalosslessdec: Fix reading too many bits in decode_channel_residues()

Fixes a part of CVE-2012-2795

CC:libav-stable@libav.org

Based on a patch by Michael Niedermayer <michaelni@gmx.at>

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
8 years agowmalosslessdec: fix a get_bits(0) in decode_ac_filter
Michael Niedermayer [Sat, 14 Apr 2012 12:50:25 +0000 (14:50 +0200)]
wmalosslessdec: fix a get_bits(0) in decode_ac_filter

Fixes a part of CVE-2012-2795

CC:libav-stable@libav.org

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agowmalosslessdec: make MCLMS arrays big enough for what is written into them.
Michael Niedermayer [Sat, 14 Apr 2012 12:49:22 +0000 (14:49 +0200)]
wmalosslessdec: make MCLMS arrays big enough for what is written into them.

Fixes a part of CVE-2012-2795

CC:libav-stable@libav.org

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoindeo4/5: check empty tile size in decode_mb_info().
Anton Khirnov [Sat, 29 Sep 2012 09:07:58 +0000 (11:07 +0200)]
indeo4/5: check empty tile size in decode_mb_info().

This prevents writing into a too small array if some parameters changed
without the tile being reallocated.

Based on a patch by Michael Niedermayer <michaelni@gmx.at>

Fixes CVE-2012-2800

CC:libav-stable@libav.org

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
8 years agoivi_common: make ff_ivi_process_empty_tile() static.
Anton Khirnov [Sat, 29 Sep 2012 09:06:54 +0000 (11:06 +0200)]
ivi_common: make ff_ivi_process_empty_tile() static.

It's not used outside of ivi_common.c

8 years agoindeo5: check tile size in decode_mb_info().
Michael Niedermayer [Sun, 15 Apr 2012 12:11:50 +0000 (14:11 +0200)]
indeo5: check tile size in decode_mb_info().

This prevents writing into a too small array if some parameters changed
without the tile being reallocated.

Fixes CVE-2012-2794

CC:libav-stable@libav.org

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoindeo3: fix out of cell write.
Anton Khirnov [Sat, 29 Sep 2012 08:39:49 +0000 (10:39 +0200)]
indeo3: fix out of cell write.

Fixes CVE-2012-2776.

CC:libav-stable@libav.org

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
8 years agoffv1enc: fix integer overflow with high resolutions and lots of slices.
Michael Niedermayer [Sat, 29 Sep 2012 17:11:25 +0000 (19:11 +0200)]
ffv1enc: fix integer overflow with high resolutions and lots of slices.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomov: add av_dlog() to dump edit lists.
Michael Niedermayer [Sat, 29 Sep 2012 16:50:18 +0000 (18:50 +0200)]
mov: add av_dlog() to dump edit lists.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomov: only print multiple edit lists warning for actually unsupported cases
Michael Niedermayer [Sat, 29 Sep 2012 16:44:35 +0000 (18:44 +0200)]
mov: only print multiple edit lists warning for actually unsupported cases

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavf: free probe data in case we close before probing finished
Michael Niedermayer [Sat, 29 Sep 2012 15:33:05 +0000 (17:33 +0200)]
lavf: free probe data in case we close before probing finished

Fixes Ticket1634

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agobink: reindent
Michael Niedermayer [Mon, 6 Feb 2012 19:47:18 +0000 (20:47 +0100)]
bink: reindent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agobink: remove unneeded special case in the init code.
Michael Niedermayer [Mon, 6 Feb 2012 18:30:25 +0000 (19:30 +0100)]
bink: remove unneeded special case in the init code.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agobink: get rid of double precision float use
Michael Niedermayer [Mon, 6 Feb 2012 18:28:22 +0000 (19:28 +0100)]
bink: get rid of double precision float use

Add a small table of integers instead as this is simpler and
avoid rounding issues (though such rounding issues are unlikely in this case)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agofate: Fix --disable-zlib
jamal [Sat, 29 Sep 2012 03:41:32 +0000 (00:41 -0300)]
fate: Fix --disable-zlib

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodshow: enhance error message
rogerdpack [Fri, 7 Sep 2012 21:52:32 +0000 (15:52 -0600)]
dshow: enhance error message

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Reviewed-by: Ramiro Polla <ramiro.polla@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodfa: replace redundant check by assert
Michael Niedermayer [Sat, 29 Sep 2012 13:24:33 +0000 (15:24 +0200)]
dfa: replace redundant check by assert

The values are checked in the wraper function used to call this code.

This was introduced by: ee715f49a06bf3898246d01b056284a9bb1bcbb9

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 29 Sep 2012 13:11:34 +0000 (15:11 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  wmalosslessdec: increase channel_coeffs/residues size
  wmalosslessdec: increase WMALL_BLOCK_MAX_BITS to 14.
  lagarith: check count before writing zeros.
  wmaprodec: check num_vec_coeffs for validity
  avidec: use actually read size instead of requested size
  avidec: return 0, not packet size from read_packet().

Conflicts:
libavcodec/lagarith.c
libavcodec/wmalosslessdec.c
libavcodec/wmaprodec.c
libavformat/avidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge commit 'b146d74730ab9ec5abede9066f770ad851e45fbc'
Michael Niedermayer [Sat, 29 Sep 2012 12:42:11 +0000 (14:42 +0200)]
Merge commit 'b146d74730ab9ec5abede9066f770ad851e45fbc'

* commit 'b146d74730ab9ec5abede9066f770ad851e45fbc':
  indeo4: update AVCodecContext width/height on size change
  dfa: check that the caller set width/height properly.
  indeo5dec: Make sure we have had a valid gop header.
  cavsdec: check for changing w/h.
  lavc: set channel count from channel layout in avcodec_open2().
  doc/platform: Rework the Visual Studio linking section
  doc/faq: Change the Visual Studio entry to reflect current status
  doc/platform: Replace Visual Studio section with build instructions
  doc/platform: Nuke section on linking static MinGW-built libs with MSVC
  doc/platform: Remove false claim about MinGW installer
  doc/platform: Mention MinGW-w64
  dsputil_mmx: fix reading prior of the src array in sub_hfyu_median_prediction()
  mpegaudiodec: fix short_start calculation

Conflicts:
doc/faq.texi
doc/platform.texi
libavcodec/cavsdec.c
libavcodec/indeo5.c
libavcodec/ivi_common.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agowmalosslessdec: increase channel_coeffs/residues size
Anton Khirnov [Sat, 29 Sep 2012 06:40:42 +0000 (08:40 +0200)]
wmalosslessdec: increase channel_coeffs/residues size

Fixes CVE-2012-2792

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
8 years agowmalosslessdec: increase WMALL_BLOCK_MAX_BITS to 14.
Anton Khirnov [Sat, 29 Sep 2012 06:37:08 +0000 (08:37 +0200)]
wmalosslessdec: increase WMALL_BLOCK_MAX_BITS to 14.

8 years agoffprobe: rework/fix ini writer
Stefano Sabatini [Wed, 26 Sep 2012 22:34:16 +0000 (00:34 +0200)]
ffprobe: rework/fix ini writer

Do not build from scratch the section header for each section, but build
it using the previous level buffer, thus improving efficiency.

Also fix some few corner cases related to numbering which are exposed by
the pending disposition patch.

8 years agoffprobe: rework/fix flat writer
Stefano Sabatini [Wed, 26 Sep 2012 17:18:03 +0000 (19:18 +0200)]
ffprobe: rework/fix flat writer

Do not build from scratch the section header for each section, but build
using the previous level buffer, thus improving efficiency and fix some
few corner cases which are exposed by the pending disposition patch.

8 years agoffprobe: generalize nesting model for the compact writer
Stefano Sabatini [Wed, 26 Sep 2012 13:39:12 +0000 (15:39 +0200)]
ffprobe: generalize nesting model for the compact writer

Regular section fields nested in a regular section are now prefixed by
the nested section name.

This is required by the pending change related to disposition.

8 years agoffprobe: generalize nesting model for the default writer
Stefano Sabatini [Wed, 26 Sep 2012 10:56:32 +0000 (12:56 +0200)]
ffprobe: generalize nesting model for the default writer

Regular section fields nested in a regular section are now prefixed by
the nested section name.

This is required by the pending change related to disposition.

8 years agoffprobe: drop SECTION_ENTRY macro
Stefano Sabatini [Fri, 28 Sep 2012 15:07:40 +0000 (17:07 +0200)]
ffprobe: drop SECTION_ENTRY macro

The use of the macro makes to add new optional fields somewhat harder.

8 years agoffprobe: add support to library ident printing
Stefano Sabatini [Fri, 28 Sep 2012 18:05:18 +0000 (20:05 +0200)]
ffprobe: add support to library ident printing

8 years agolagarith: check count before writing zeros.
Michael Niedermayer [Sat, 14 Apr 2012 16:28:31 +0000 (18:28 +0200)]
lagarith: check count before writing zeros.

Fixes CVE-2012-2793

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agowmaprodec: check num_vec_coeffs for validity
Michael Niedermayer [Sat, 14 Apr 2012 09:07:11 +0000 (11:07 +0200)]
wmaprodec: check num_vec_coeffs for validity

Fixes CVE-2012-2789

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoavidec: use actually read size instead of requested size
Anton Khirnov [Fri, 28 Sep 2012 13:42:29 +0000 (15:42 +0200)]
avidec: use actually read size instead of requested size

Fixes CVE-2012-2788

8 years agoavidec: return 0, not packet size from read_packet().
Anton Khirnov [Fri, 28 Sep 2012 13:26:48 +0000 (15:26 +0200)]
avidec: return 0, not packet size from read_packet().

8 years agoindeo4: update AVCodecContext width/height on size change
Michael Niedermayer [Sat, 14 Apr 2012 18:04:05 +0000 (20:04 +0200)]
indeo4: update AVCodecContext width/height on size change

Fixes CVE-2012-2787

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agodfa: check that the caller set width/height properly.
Anton Khirnov [Fri, 28 Sep 2012 12:47:56 +0000 (14:47 +0200)]
dfa: check that the caller set width/height properly.

Fixes CVE-2012-2786.

8 years agoindeo5dec: Make sure we have had a valid gop header.
Michael Niedermayer [Sat, 24 Mar 2012 16:43:55 +0000 (17:43 +0100)]
indeo5dec: Make sure we have had a valid gop header.

This prevents decoding happening on a half initialized context.

Fixes CVE-2012-2779

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agocavsdec: check for changing w/h.
Michael Niedermayer [Sat, 24 Mar 2012 01:40:24 +0000 (02:40 +0100)]
cavsdec: check for changing w/h.

Our decoder does not support changing w/h.

Fixes CVE-2012-2777 and CVE-2012-2784.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agolavc: set channel count from channel layout in avcodec_open2().
Anton Khirnov [Fri, 28 Sep 2012 18:46:20 +0000 (20:46 +0200)]
lavc: set channel count from channel layout in avcodec_open2().

Some decoders (e.g. nellymoser) only set channel_layout and do not set
channel count.

8 years agodoc/platform: Rework the Visual Studio linking section
Derek Buitenhuis [Fri, 28 Sep 2012 01:52:34 +0000 (01:52 +0000)]
doc/platform: Rework the Visual Studio linking section

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
8 years agodoc/faq: Change the Visual Studio entry to reflect current status
Derek Buitenhuis [Thu, 27 Sep 2012 19:02:28 +0000 (19:02 +0000)]
doc/faq: Change the Visual Studio entry to reflect current status

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
8 years agodoc/platform: Replace Visual Studio section with build instructions
Derek Buitenhuis [Thu, 27 Sep 2012 18:39:02 +0000 (18:39 +0000)]
doc/platform: Replace Visual Studio section with build instructions

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
8 years agodoc/platform: Nuke section on linking static MinGW-built libs with MSVC
Derek Buitenhuis [Thu, 27 Sep 2012 18:39:01 +0000 (18:39 +0000)]
doc/platform: Nuke section on linking static MinGW-built libs with MSVC

This practice is not supported by the MinGW developers, and even requires
patching the MinGW runtimes in newer versions. Furthermore, we now support
build with MSVC, so this section is rendered useless.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
8 years agodoc/platform: Remove false claim about MinGW installer
Derek Buitenhuis [Thu, 27 Sep 2012 18:39:00 +0000 (18:39 +0000)]
doc/platform: Remove false claim about MinGW installer

This works just fine, and has for quite a while, using the mingw-get
installer.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
8 years agodoc/platform: Mention MinGW-w64
Derek Buitenhuis [Thu, 27 Sep 2012 18:38:59 +0000 (18:38 +0000)]
doc/platform: Mention MinGW-w64

This is the toolchain most use to build.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
8 years agodoc/platform: Rework the Visual Studio linking section
Derek Buitenhuis [Fri, 28 Sep 2012 01:52:34 +0000 (01:52 +0000)]
doc/platform: Rework the Visual Studio linking section

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
8 years agodoc/faq: Change the Visual Studio entry to reflect current status
Derek Buitenhuis [Thu, 27 Sep 2012 19:02:28 +0000 (19:02 +0000)]
doc/faq: Change the Visual Studio entry to reflect current status

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
8 years agodoc/platform: Replace Visual Studio section with build instructions
Derek Buitenhuis [Thu, 27 Sep 2012 18:39:02 +0000 (18:39 +0000)]
doc/platform: Replace Visual Studio section with build instructions

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
8 years agodoc/platform: Nuke section on linking static MinGW-built libs with MSVC
Derek Buitenhuis [Thu, 27 Sep 2012 18:39:01 +0000 (18:39 +0000)]
doc/platform: Nuke section on linking static MinGW-built libs with MSVC

This practice is not supported by the MinGW developers, and even requires
patching the MinGW runtimes in newer versions. Furthermore, we now support
build with MSVC, so this section is rendered useless.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
8 years agodoc/platform: Remove false claim about MinGW installer
Derek Buitenhuis [Thu, 27 Sep 2012 18:39:00 +0000 (18:39 +0000)]
doc/platform: Remove false claim about MinGW installer

This works just fine, and has for quite a while, using the mingw-get
installer.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
8 years agodoc/platform: Mention MinGW-w64
Derek Buitenhuis [Thu, 27 Sep 2012 18:38:59 +0000 (18:38 +0000)]
doc/platform: Mention MinGW-w64

This is the toolchain most, including Libav's nightlies, use to build.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
8 years agomov: remove default of 1024 sample skip for aac.
Michael Niedermayer [Fri, 28 Sep 2012 18:09:33 +0000 (20:09 +0200)]
mov: remove default of 1024 sample skip for aac.

It is not correct in all cases and it is less predictable than a skip of 0
for user applications.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoaacdec: detect faac and skip correct amount of startup samples
Michael Niedermayer [Fri, 28 Sep 2012 18:03:50 +0000 (20:03 +0200)]
aacdec: detect faac and skip correct amount of startup samples

This also fixes aac in adts and other containers than mov.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodsputil_mmx: fix reading prior of the src array in sub_hfyu_median_prediction()
Michael Niedermayer [Thu, 27 Sep 2012 14:06:54 +0000 (14:06 +0000)]
dsputil_mmx: fix reading prior of the src array in sub_hfyu_median_prediction()

This should fix the utvideoenc valgrind failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffprobe: remove unused "args" argument in writer init callback
Stefano Sabatini [Wed, 26 Sep 2012 11:10:15 +0000 (13:10 +0200)]
ffprobe: remove unused "args" argument in writer init callback

The parameter is no longer used, since the arguments are parsed at the
framework level.

8 years agompegaudiodec: fix short_start calculation
Luca Barbato [Fri, 28 Sep 2012 12:38:13 +0000 (14:38 +0200)]
mpegaudiodec: fix short_start calculation

The value should be always 3, as it follows from the specification.

Fix a stack buffer overflow in exponents_from_scale_factors as reported
by asan. Thanks to Dale Curtis for the sample vector.

8 years agoAdd missing version macros to libraries
jamal [Thu, 27 Sep 2012 14:12:19 +0000 (11:12 -0300)]
Add missing version macros to libraries

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswresample: Create version.h header
jamal [Thu, 27 Sep 2012 07:35:31 +0000 (04:35 -0300)]
swresample: Create version.h header

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agopostproc: Create version.h header
jamal [Thu, 27 Sep 2012 14:12:18 +0000 (11:12 -0300)]
postproc: Create version.h header

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoavcodec: Add missing include to version.h
jamal [Thu, 27 Sep 2012 07:35:29 +0000 (04:35 -0300)]
avcodec: Add missing include to version.h

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agonutdec: fix get_vb_trace() / -DTRACE compile
Michael Niedermayer [Fri, 28 Sep 2012 12:21:27 +0000 (14:21 +0200)]
nutdec: fix get_vb_trace() / -DTRACE compile

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 28 Sep 2012 11:36:22 +0000 (13:36 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libopus: Remap channels using libopus' internal remapping.
  Opus decoder using libopus
  avcodec: document the use of AVCodecContext.delay for audio decoding
  vc1dec: add flush function for WMV9 and VC-1 decoders
  http: Increase buffer sizes to cope with longer URIs
  nutenc: const correctness for ff_put_v_trace/put_s_trace function arguments
  h264_refs: Fix debug tprintf argument types
  golomb: const correctness for get_ue()/get_se() function arguments
  get_bits: const correctness for get_bits_trace()/get_xbits_trace() arguments

Conflicts:
Changelog
libavcodec/Makefile
libavcodec/version.h
libavformat/http.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibopus: Remap channels using libopus' internal remapping.
Nathan Caldwell [Thu, 27 Sep 2012 08:23:29 +0000 (02:23 -0600)]
libopus: Remap channels using libopus' internal remapping.

This way we can directly remap channels from Opus' channel order to
libav's internal channel order, instead of mapping channels from
Opus' order to Vorbis' order then to libav's order.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agoOpus decoder using libopus
Nicolas George [Fri, 28 Sep 2012 01:39:23 +0000 (19:39 -0600)]
Opus decoder using libopus

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agoavcodec: document the use of AVCodecContext.delay for audio decoding
Nathan Caldwell [Fri, 28 Sep 2012 04:41:24 +0000 (22:41 -0600)]
avcodec: document the use of AVCodecContext.delay for audio decoding

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agovc1dec: add flush function for WMV9 and VC-1 decoders
Kostya Shishkov [Thu, 27 Sep 2012 17:25:06 +0000 (19:25 +0200)]
vc1dec: add flush function for WMV9 and VC-1 decoders

CC: libav-stable@libav.org
8 years agoconfigure: add missing dependancies for gpl tests
Michael Niedermayer [Fri, 28 Sep 2012 03:25:22 +0000 (05:25 +0200)]
configure: add missing dependancies for gpl tests

fixes fate without --enable-gpl

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 28 Sep 2012 02:54:38 +0000 (04:54 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dwt: Drop unused functions spatial_compose{53|97}i()
  nutdec: Remove unused and broken debug function stub
  avcodec: Drop long-deprecated imgconvert.h header
  Add Opus support to the Ogg muxer.
  Add Opus codec id and codec description.
  avformat: Identify anonymous AVIO typedef structs.

Conflicts:
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/imgconvert.h
libavcodec/version.h
libavformat/oggenc.c
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomp3dec: ask for 8khz switch point mp3s
Michael Niedermayer [Fri, 28 Sep 2012 02:39:10 +0000 (04:39 +0200)]
mp3dec: ask for 8khz switch point mp3s

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agotests/Makefile: fix ffprobe test dependancy
Michael Niedermayer [Fri, 28 Sep 2012 00:58:35 +0000 (02:58 +0200)]
tests/Makefile: fix ffprobe test dependancy

This fixes the ffprobe tests under mingw/wine

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoasfenc: avoid negative timestamps n1.1-dev
Michael Niedermayer [Fri, 28 Sep 2012 00:31:07 +0000 (02:31 +0200)]
asfenc: avoid negative timestamps

Fixes Ticket1606

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomp3dec: Fix possibly exploitable crash
Michael Niedermayer [Thu, 27 Sep 2012 23:38:44 +0000 (01:38 +0200)]
mp3dec: Fix possibly exploitable crash

I was sadly unable to find a non fuzzed mp3 that uses the
feature that contained the bug (and i searched hard ...), thus
while this fixes the security issue. It may or may not fix
mixed blocks in 8khz mp3s, i cant say due to lack of samples to test.

Security issue exists since: b37d945dd4213cb8e92146571b0374cd45d52286

Reported-by: Dale Curtis <dalecurtis@google.com>
(Probably) Found-by: inferno@chromium.org
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agohttp: Increase buffer sizes to cope with longer URIs
Duncan Salerno [Sat, 22 Sep 2012 20:17:36 +0000 (21:17 +0100)]
http: Increase buffer sizes to cope with longer URIs

Use the MAX_URL_SIZE define where applicable. Increase buffer
sizes for all buffers that need to fit a long pathname - buffers
that need to fit only the hostname (and other short strings, but
not the pathname - such as "headers" in http_connect) are kept
at 1024 bytes for now.

Also increase the max line length in http_read_header, since it
might need to contain a full url for Location: redirects.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agomxfdec: allow container_ul to override codec_ul if codec is A-law
Marton Balint [Wed, 26 Sep 2012 22:24:46 +0000 (00:24 +0200)]
mxfdec: allow container_ul to override codec_ul if codec is A-law

Fixes some DNXHD files generated by AVID TM, where codec UL was set to A-law
meanwhile the real audio codec was PCM S16. According to SMPTE RP 224, A-law is
the default value for sound essence parameters therefore we should handle it
specially.

Signed-off-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoChangelog, split next from 1.0
Michael Niedermayer [Thu, 27 Sep 2012 18:25:53 +0000 (20:25 +0200)]
Changelog, split next from 1.0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agompegvideo_enc: reduce QMAT_SHIFT to avoid overflow in dnxhd
Michael Niedermayer [Thu, 20 Sep 2012 20:29:03 +0000 (22:29 +0200)]
mpegvideo_enc: reduce QMAT_SHIFT to avoid overflow in dnxhd

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agonutenc: const correctness for ff_put_v_trace/put_s_trace function arguments
Diego Biurrun [Thu, 27 Sep 2012 17:30:37 +0000 (19:30 +0200)]
nutenc: const correctness for ff_put_v_trace/put_s_trace function arguments

8 years agoh264_refs: Fix debug tprintf argument types
Diego Biurrun [Tue, 25 Sep 2012 17:05:26 +0000 (19:05 +0200)]
h264_refs: Fix debug tprintf argument types

8 years agogolomb: const correctness for get_ue()/get_se() function arguments
Diego Biurrun [Tue, 25 Sep 2012 17:04:47 +0000 (19:04 +0200)]
golomb: const correctness for get_ue()/get_se() function arguments

8 years agoget_bits: const correctness for get_bits_trace()/get_xbits_trace() arguments
Diego Biurrun [Tue, 25 Sep 2012 17:03:59 +0000 (19:03 +0200)]
get_bits: const correctness for get_bits_trace()/get_xbits_trace() arguments

8 years agolavfi/sink_buffer: implement libav compatibility API.
Nicolas George [Sun, 23 Sep 2012 18:45:49 +0000 (20:45 +0200)]
lavfi/sink_buffer: implement libav compatibility API.

Implement av_buffersink_read() and av_buffersink_read_samples()
for ffmpeg's version of buffersink.

With this change, avconv linked against ffmpeg's libraries passes
the same number of tests whether it uses ffbuffersink or
buffersink_old.

8 years agolavf: move fields that appear to be intended as public API to the correct section
Michael Niedermayer [Wed, 26 Sep 2012 13:24:00 +0000 (15:24 +0200)]
lavf: move fields that appear to be intended as public API to the correct section

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodsputil_mmx: fix reading prior of the src array in sub_hfyu_median_prediction()
Michael Niedermayer [Thu, 27 Sep 2012 13:52:21 +0000 (15:52 +0200)]
dsputil_mmx: fix reading prior of the src array in sub_hfyu_median_prediction()

This should fix the utvideoenc valgrind failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavfi: enable buffersinks unconditionally.
Nicolas George [Wed, 26 Sep 2012 09:59:56 +0000 (11:59 +0200)]
lavfi: enable buffersinks unconditionally.

They are part of the public API. Their libav compatibility
counterpart are already enabled unconditionally.

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 27 Sep 2012 12:23:23 +0000 (14:23 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  nutdec: const correctness for get_v_trace/get_s_trace function arguments
  truemotion2: Request samples for old TM2 headers
  rtpdec: Remove a useless ff_ prefix from a static symbol
  rtpdec: Support depacketizing speex
  rtpenc: Add support for packetizing speex

Conflicts:
libavformat/rtpdec.c
libavformat/sdp.c
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodwt: Drop unused functions spatial_compose{53|97}i()
Diego Biurrun [Mon, 24 Sep 2012 15:07:22 +0000 (17:07 +0200)]
dwt: Drop unused functions spatial_compose{53|97}i()

8 years agonutdec: Remove unused and broken debug function stub
Diego Biurrun [Tue, 25 Sep 2012 17:01:10 +0000 (19:01 +0200)]
nutdec: Remove unused and broken debug function stub

8 years agoavcodec: Drop long-deprecated imgconvert.h header
Diego Biurrun [Mon, 24 Sep 2012 14:51:33 +0000 (16:51 +0200)]
avcodec: Drop long-deprecated imgconvert.h header

8 years agoAdd Opus support to the Ogg muxer.
Nathan Caldwell [Thu, 27 Sep 2012 08:21:56 +0000 (02:21 -0600)]
Add Opus support to the Ogg muxer.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agoAdd Opus codec id and codec description.
Andrew D'Addesio [Wed, 19 Sep 2012 01:02:14 +0000 (19:02 -0600)]
Add Opus codec id and codec description.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agoavformat: Identify anonymous AVIO typedef structs.
Dale Curtis [Thu, 27 Sep 2012 02:21:03 +0000 (19:21 -0700)]
avformat: Identify anonymous AVIO typedef structs.

Anonymous typedef structs prevent forward declaration, this
change gives the AVIOContext and AVIOInterruptCB structures
a name.  These structures are now in line with other common
structures such as AVFormatContext and AVCodecContext.

Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agofate: add faststart regression test.
Clément Bœsch [Mon, 24 Sep 2012 07:36:09 +0000 (09:36 +0200)]
fate: add faststart regression test.

Also factorize the common options for the different mov-based tests.

Since the header is now on top in the last generated file, the data
offset in the seek test needed some updates as well.

8 years agolavf/movenc: add faststart option.
Clément Bœsch [Thu, 20 Sep 2012 08:40:10 +0000 (10:40 +0200)]
lavf/movenc: add faststart option.

8 years agolavf/movenc: make mov_write_stco_tag() not use the offset pos for mode64 heuristic.
Clément Bœsch [Thu, 20 Sep 2012 08:39:04 +0000 (10:39 +0200)]
lavf/movenc: make mov_write_stco_tag() not use the offset pos for mode64 heuristic.

At the moment, the moov header is written at the end of the file, so we
can use the current offset (which focus on the end of the mdat already
written) to guess if 64-bits offset will be required or not.

Though, the next commits will make possible the writing of this table at
the beginning, so this heuristic can't work. As a consequence, we check
all the values within the potential offset table for any value >
32-bits.