ffmpeg.git
7 years agoerror_concealment: optimize guess_dc()
Michael Niedermayer [Wed, 21 Dec 2011 23:24:39 +0000 (00:24 +0100)]
error_concealment: optimize guess_dc()
Fixes Ticket811
Bug found by: Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoipmovie: fix FPE
Michael Niedermayer [Wed, 21 Dec 2011 21:02:01 +0000 (22:02 +0100)]
ipmovie: fix FPE
Fixed Ticket807
Bug found by: Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoproresdec: Check yuv slice data sizes.
Michael Niedermayer [Wed, 21 Dec 2011 20:06:05 +0000 (21:06 +0100)]
proresdec: Check yuv slice data sizes.
Fixes overread
Fixes Ticket812
Bug found by: Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoClearer explanation of audio channel mapping restrictions
Tim Nicholson [Wed, 21 Dec 2011 17:12:05 +0000 (17:12 +0000)]
Clearer explanation of audio channel mapping restrictions

7 years agodoc: add a list of errno codes on some systems.
Nicolas George [Wed, 21 Dec 2011 16:10:02 +0000 (17:10 +0100)]
doc: add a list of errno codes on some systems.

7 years agomov: replace AVERROR(EOF) with AVERROR_EOF.
Nicolas George [Tue, 20 Dec 2011 18:52:17 +0000 (19:52 +0100)]
mov: replace AVERROR(EOF) with AVERROR_EOF.

7 years agompeg12dec: reset first_field with picture_structure changes.
Michael Niedermayer [Wed, 21 Dec 2011 17:19:06 +0000 (18:19 +0100)]
mpeg12dec: reset first_field with picture_structure changes.
Fixes Ticket809
Bug found by: Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'tjoppen/mxf_fixes_20111220'
Michael Niedermayer [Wed, 21 Dec 2011 14:51:42 +0000 (15:51 +0100)]
Merge remote-tracking branch 'tjoppen/mxf_fixes_20111220'

* tjoppen/mxf_fixes_20111220:
  mxfdec: Sanity-check SampleRate
  mxfdec: Make sure mxf->nb_index_tables > 0 in mxf_packet_timestamps()
  mxfdec: Remove unused variables
  mxfdec: Make sure x < index_table->nb_ptses
  mxfdec: Ignore the last entry in Avid's index table segments

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc: Do not fail audio decoding if user has set a custom get_buffer.
Michael Niedermayer [Wed, 21 Dec 2011 14:49:56 +0000 (15:49 +0100)]
lavc: Do not fail audio decoding if user has set a custom get_buffer.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavio: remove ENOTSUP mention in doxy as its not available on all supported platforms
Michael Niedermayer [Wed, 21 Dec 2011 03:52:34 +0000 (04:52 +0100)]
avio: remove ENOTSUP mention in doxy as its not available on all supported platforms
and thus cannot be used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 21 Dec 2011 01:46:08 +0000 (02:46 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavc: always align height by 32 pixel
  raw: add 10bit YUV definitions
  nut: support 10bit YUV
  mpegvideo_enc: separate declarations and statements
  oma: make header compile standalone
  vp3: Reorder some functions to fix VP3 build with Theora disabled.
  build: fix standalone compilation of ADX encoder
  build: fix standalone compilation of ADPCM decoders
  build: fix standalone compilation of mpc7/mpc8 decoders
  4xm: Use bytestream2 functions to prevent overreads
  bytestream: add a new set of bytestream functions with overread checking
  mpegts: Suppress invalid timebase warnings on DMB streams.
  mpegts: Fix typo in handling sections in the PMT.
  vc1dec: Use the right pointer type for the tmp pointer

Conflicts:
libavcodec/4xm.c
libavcodec/utils.c
libavcodec/vc1dec.c
libavcodec/vp3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoindeo3: Fix null ptr dereference
Michael Niedermayer [Tue, 20 Dec 2011 23:35:10 +0000 (00:35 +0100)]
indeo3: Fix null ptr dereference
Fixes Ticket804
Bug found by: Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agogolomb: fix end of bitstream check
Michael Niedermayer [Tue, 20 Dec 2011 23:28:39 +0000 (00:28 +0100)]
golomb: fix end of bitstream check
Fixes Ticket806
Bug found by Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomxfdec: Make sure mxf->nb_index_tables > 0 in mxf_packet_timestamps()
Tomas Härdin [Tue, 20 Dec 2011 10:22:23 +0000 (11:22 +0100)]
mxfdec: Make sure mxf->nb_index_tables > 0 in mxf_packet_timestamps()

Only the OPAtom demuxing logic is guaranteed to have index tables, meaning OP1a
files that lack an index would cause SIGSEGV.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc: always align height by 32 pixel
Rafaël Carré [Tue, 13 Dec 2011 14:32:34 +0000 (15:32 +0100)]
lavc: always align height by 32 pixel

Interlaced content for most codec requires it.
This patch is a stop-gap pending a serious rework to support
codecs with non 16 pixel macroblocks.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agoraw: add 10bit YUV definitions
Luca Barbato [Sun, 4 Dec 2011 14:56:40 +0000 (15:56 +0100)]
raw: add 10bit YUV definitions

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agonut: support 10bit YUV
Luca Barbato [Sun, 4 Dec 2011 14:56:39 +0000 (15:56 +0100)]
nut: support 10bit YUV

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agompegvideo_enc: separate declarations and statements
Diego Biurrun [Tue, 20 Dec 2011 09:06:49 +0000 (10:06 +0100)]
mpegvideo_enc: separate declarations and statements

libavcodec/mpegvideo_enc.c:1209: warning: ISO C90 forbids mixed declarations and code

7 years agooma: make header compile standalone
Diego Biurrun [Tue, 20 Dec 2011 14:38:18 +0000 (15:38 +0100)]
oma: make header compile standalone

7 years agovp3: Reorder some functions to fix VP3 build with Theora disabled.
Diego Biurrun [Tue, 20 Dec 2011 13:42:54 +0000 (14:42 +0100)]
vp3: Reorder some functions to fix VP3 build with Theora disabled.

7 years agobuild: fix standalone compilation of ADX encoder
Diego Biurrun [Tue, 20 Dec 2011 17:26:54 +0000 (18:26 +0100)]
build: fix standalone compilation of ADX encoder

The encoder depends on the common code, so link against it.

7 years agobuild: fix standalone compilation of ADPCM decoders
Diego Biurrun [Tue, 20 Dec 2011 10:37:56 +0000 (11:37 +0100)]
build: fix standalone compilation of ADPCM decoders

The generic ADPCM codes depends on the ADPCM data tables.

7 years agobuild: fix standalone compilation of mpc7/mpc8 decoders
Diego Biurrun [Tue, 20 Dec 2011 10:34:05 +0000 (11:34 +0100)]
build: fix standalone compilation of mpc7/mpc8 decoders

These decoders depend on the mpegaudio DSP code.

7 years agoindeo5: Fix null pointer dereference
Michael Niedermayer [Tue, 20 Dec 2011 21:06:35 +0000 (22:06 +0100)]
indeo5: Fix null pointer dereference
Fixes Ticket803
Bug found by: Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoff*: Fix duplicatedly printed version info with -version
Michael Niedermayer [Tue, 20 Dec 2011 21:03:25 +0000 (22:03 +0100)]
ff*: Fix duplicatedly printed version info with -version

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years ago4xm: Use bytestream2 functions to prevent overreads
Aneesh Dogra [Mon, 19 Dec 2011 22:24:50 +0000 (03:54 +0530)]
4xm: Use bytestream2 functions to prevent overreads

Fixes Bug 110.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
7 years agobytestream: add a new set of bytestream functions with overread checking
Aneesh Dogra [Mon, 19 Dec 2011 22:24:50 +0000 (03:54 +0530)]
bytestream: add a new set of bytestream functions with overread checking

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
7 years agoReplace PATCHWELCOME by relevant error codes.
Nicolas George [Tue, 20 Dec 2011 18:08:04 +0000 (19:08 +0100)]
Replace PATCHWELCOME by relevant error codes.

This supersedes commit 154c0a8.
The bug was also reported by Rafaël Carré.

7 years agompegts: Suppress invalid timebase warnings on DMB streams.
Alex Converse [Mon, 19 Dec 2011 18:48:57 +0000 (10:48 -0800)]
mpegts: Suppress invalid timebase warnings on DMB streams.

timestamp_len and timestamp_res intialize to zero.

7 years agompegts: Fix typo in handling sections in the PMT.
Alex Converse [Mon, 19 Dec 2011 18:41:22 +0000 (10:41 -0800)]
mpegts: Fix typo in handling sections in the PMT.

This was an error rebasing 4682a1dc3aa2554ad7077f5db32d0f2d598d018e for
commit. The "pes" variable guaranteed to be NULL in that block.

7 years agoreplace ENOTSUP by AVERROR_PATCHWELCOME
Michael Niedermayer [Tue, 20 Dec 2011 17:34:44 +0000 (18:34 +0100)]
replace ENOTSUP by AVERROR_PATCHWELCOME
This unbreaks compilation
Found by: jb

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc: make developer.texi point to correct fate doc
Derek Buitenhuis [Mon, 12 Dec 2011 18:02:04 +0000 (13:02 -0500)]
doc: make developer.texi point to correct fate doc

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoroq: fix excessive memory alloc
Michael Niedermayer [Tue, 20 Dec 2011 17:00:30 +0000 (18:00 +0100)]
roq: fix excessive memory alloc
Fixes Ticket802
Bug found by: Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoalac: Check for bitstream overread
Michael Niedermayer [Tue, 20 Dec 2011 16:51:53 +0000 (17:51 +0100)]
alac: Check for bitstream overread
Fixes Ticket801
Bug found by: Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotm2: Check remaining size before init_get_bits()
Michael Niedermayer [Tue, 20 Dec 2011 15:53:56 +0000 (16:53 +0100)]
tm2: Check remaining size before init_get_bits()
Fixes a null pointer dereference.
Fixes 2nd half of Ticket800
Bug found by: Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavidec: move eof check before continue.
Michael Niedermayer [Tue, 20 Dec 2011 15:52:42 +0000 (16:52 +0100)]
avidec: move eof check before continue.
Fixes a infinite loop
Fixes half of Ticket800
Bug found by Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc: fate: Support building a plain text version
Alexander Strasser [Mon, 19 Dec 2011 23:28:47 +0000 (00:28 +0100)]
doc: fate: Support building a plain text version

  Also create a plain text (.txt) file from fate.texi if the makeinfo
program is available.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc: fate: Move documentation from .txt to .texi
Alexander Strasser [Mon, 19 Dec 2011 23:28:13 +0000 (00:28 +0100)]
doc: fate: Move documentation from .txt to .texi

  The fate.txt file is ported to texinfo format. Therefore the
fate.txt is renamed to fate.texi. The contents of the already
existing fate.texi file are discarded.

  However there should be no loss of information. If you find
anything missing, please report.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc: build: TEXIDEP: Recognize verbatim includes
Alexander Strasser [Mon, 19 Dec 2011 23:27:22 +0000 (00:27 +0100)]
doc: build: TEXIDEP: Recognize verbatim includes

  When generating the .dep files for .texi sources, verbatim includes
(@verbatiminclude) should also be taken into account.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavd/lavfi: reindent block in lavfi_read_header
Stefano Sabatini [Tue, 20 Dec 2011 12:18:48 +0000 (13:18 +0100)]
lavd/lavfi: reindent block in lavfi_read_header

7 years agolavd/lavfi: add check in case pix_fmts cannot be allocated in lavfi_read_header()
Stefano Sabatini [Tue, 20 Dec 2011 12:17:03 +0000 (13:17 +0100)]
lavd/lavfi: add check in case pix_fmts cannot be allocated in lavfi_read_header()

7 years agomxfdec: Sanity-check SampleRate
Tomas Härdin [Tue, 20 Dec 2011 10:32:23 +0000 (11:32 +0100)]
mxfdec: Sanity-check SampleRate

This avoids a SIGFPE if SampleRate is missing or set to naughty values.

7 years agomxfdec: Make sure mxf->nb_index_tables > 0 in mxf_packet_timestamps()
Tomas Härdin [Tue, 20 Dec 2011 10:22:23 +0000 (11:22 +0100)]
mxfdec: Make sure mxf->nb_index_tables > 0 in mxf_packet_timestamps()

Only the OPAtom demuxing logic is guaranteed to have index tables, meaning OP1a
files that lack an index would cause SIGSEGV.

7 years agoswr: fix assert failure
Michael Niedermayer [Tue, 20 Dec 2011 10:23:46 +0000 (11:23 +0100)]
swr: fix assert failure
Bug found by: Oana Stratulat
GCI-id: 7211207

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoChangelog: split version next and 0.9
Michael Niedermayer [Tue, 20 Dec 2011 09:24:41 +0000 (10:24 +0100)]
Changelog: split version next and 0.9

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFix off-by-one error when decoding rigth-to-left targa.
Carl Eugen Hoyos [Tue, 20 Dec 2011 10:03:13 +0000 (11:03 +0100)]
Fix off-by-one error when decoding rigth-to-left targa.

7 years agovc1dec: Use the right pointer type for the tmp pointer
Martin Storsjö [Tue, 20 Dec 2011 08:53:18 +0000 (10:53 +0200)]
vc1dec: Use the right pointer type for the tmp pointer

This fixes warnings about assignment from incompatible
pointer type.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agomxfdec: Remove unused variables
Tomas Härdin [Tue, 20 Dec 2011 08:59:29 +0000 (09:59 +0100)]
mxfdec: Remove unused variables

7 years agomxfdec: Make sure x < index_table->nb_ptses
Tomas Härdin [Tue, 20 Dec 2011 08:57:07 +0000 (09:57 +0100)]
mxfdec: Make sure x < index_table->nb_ptses

Without this the demuxer will SIGSEGV on files with IndexEntryCount < IndexDuration

7 years agomxfdec: Ignore the last entry in Avid's index table segments
Tomas Härdin [Mon, 19 Dec 2011 10:00:14 +0000 (11:00 +0100)]
mxfdec: Ignore the last entry in Avid's index table segments

The last entry is the total size of the essence container.
Previously a TemporalOffset error would be logged, even though segments like
these are expected.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 20 Dec 2011 00:54:41 +0000 (01:54 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: clear trailing bits in partially parsed NAL units
  vc1: Handle WVC1 interlaced stream
  xl: Fix overreads
  mpegts: rename payload_index to payload_size
  segment: introduce segmented chain muxer
  lavu: add AVERROR_BUG error value
  avplay: clear pkt_temp when pkt is freed.
  qcelpdec: K&R formatting cosmetics
  qcelpdec: cosmetics: drop some pointless parentheses
  x86: conditionally compile dnxhd encoder optimizations
  Revert "h264: skip start code search if the size of the nal unit is known"
  swscale: fix formatting and indentation of unscaled conversion routines.
  h264: skip start code search if the size of the nal unit is known
  cljr: fix buf_size sanity check
  cljr: Check if width and height are positive integers

Conflicts:
libavcodec/cljr.c
libavcodec/vc1dec.c
libavformat/Makefile
libavformat/mpegtsenc.c
libavformat/segment.c
libswscale/swscale_unscaled.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Mon, 19 Dec 2011 23:14:59 +0000 (00:14 +0100)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: remove global video state

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: clear trailing bits in partially parsed NAL units
Janne Grunau [Mon, 19 Dec 2011 17:11:44 +0000 (18:11 +0100)]
h264: clear trailing bits in partially parsed NAL units

Trailing bits are likely to be non-zero if the NAL unit is truncated.
Clearing the bits make overreads of the bitstream less likely in this
case. Fixes playback of
http://streams.videolan.org/streams/mp4/Mr_MrsSmith-h264_aac.mp4 which
has a forbidden byte sequence of 0x00 0x00 0x00 in it SPS.

7 years agoffplay: remove global video state
Marton Balint [Sun, 4 Dec 2011 14:32:12 +0000 (15:32 +0100)]
ffplay: remove global video state

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agovc1: Handle WVC1 interlaced stream
Aneesh Dogra [Mon, 19 Dec 2011 20:08:19 +0000 (01:38 +0530)]
vc1: Handle WVC1 interlaced stream

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agosiff: simplify code by using ffio_limit()
Michael Niedermayer [Mon, 19 Dec 2011 18:23:56 +0000 (19:23 +0100)]
siff: simplify code by using ffio_limit()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoxl: Fix overreads
Aneesh Dogra [Mon, 19 Dec 2011 18:30:30 +0000 (00:00 +0530)]
xl: Fix overreads

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agosoxdec: check av_malloc return.
Michael Niedermayer [Mon, 19 Dec 2011 18:11:49 +0000 (19:11 +0100)]
soxdec: check av_malloc return.
Bug found by: durandal_1707

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompegts: rename payload_index to payload_size
Luca Barbato [Sat, 17 Dec 2011 13:08:11 +0000 (14:08 +0100)]
mpegts: rename payload_index to payload_size

It holds the size of the current payload.

7 years agosegment: introduce segmented chain muxer
Luca Barbato [Sun, 2 Oct 2011 21:05:29 +0000 (23:05 +0200)]
segment: introduce segmented chain muxer

It behaves similarly to image2 muxer

7 years agolavu: add AVERROR_BUG error value
Luca Barbato [Wed, 14 Dec 2011 19:27:11 +0000 (20:27 +0100)]
lavu: add AVERROR_BUG error value

It should be used to mark codepath that can be reached only through
programming error.

7 years agoavplay: clear pkt_temp when pkt is freed.
Michael Niedermayer [Tue, 13 Dec 2011 23:38:23 +0000 (00:38 +0100)]
avplay: clear pkt_temp when pkt is freed.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
7 years agoeamad: pass & check errors
Michael Niedermayer [Mon, 19 Dec 2011 15:30:30 +0000 (16:30 +0100)]
eamad: pass & check errors

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoeamad: fix excessive memory allocation.
Michael Niedermayer [Mon, 19 Dec 2011 15:27:52 +0000 (16:27 +0100)]
eamad: fix excessive memory allocation.
Fixes Ticket792
Bug found by Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoqcelpdec: K&R formatting cosmetics
Asen Lekov [Sun, 18 Dec 2011 23:32:54 +0000 (01:32 +0200)]
qcelpdec: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agoqcelpdec: cosmetics: drop some pointless parentheses
Diego Biurrun [Mon, 19 Dec 2011 13:54:58 +0000 (14:54 +0100)]
qcelpdec: cosmetics: drop some pointless parentheses

7 years agosws: Print an error in case of av_malloc() failure
Michael Niedermayer [Mon, 19 Dec 2011 15:01:37 +0000 (16:01 +0100)]
sws: Print an error in case of av_malloc() failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswscale: Fix several (real world) integer overflows.
Michael Niedermayer [Mon, 19 Dec 2011 14:48:47 +0000 (15:48 +0100)]
swscale: Fix several (real world) integer overflows.
Fixes Ticket795
Bug Found by: Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86: conditionally compile dnxhd encoder optimizations
Diego Biurrun [Sun, 18 Dec 2011 12:13:02 +0000 (13:13 +0100)]
x86: conditionally compile dnxhd encoder optimizations

7 years agodsicin demuxer: Fix excessive malloc()
Michael Niedermayer [Mon, 19 Dec 2011 10:47:15 +0000 (11:47 +0100)]
dsicin demuxer: Fix excessive malloc()
use ffio_limit()
Fixes Ticket 790
Bug found by: Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf: split out ffio_limit()
Michael Niedermayer [Mon, 19 Dec 2011 10:46:34 +0000 (11:46 +0100)]
lavf: split out ffio_limit()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotqi: Fix passing errors from the MB decode. This silences some valgrind warnings.
Michael Niedermayer [Mon, 19 Dec 2011 03:13:37 +0000 (04:13 +0100)]
tqi: Fix passing errors from the MB decode. This silences some valgrind warnings.
Fixes second half of Ticket794
Bug found by: Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoadpcm: Fix crash
Michael Niedermayer [Mon, 19 Dec 2011 03:09:23 +0000 (04:09 +0100)]
adpcm: Fix crash
Fixes half of Ticket794
Bug found by: Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoproresdec: add UPDATE_CACHE, should fix decoding with -Os
Michael Niedermayer [Mon, 19 Dec 2011 02:43:53 +0000 (03:43 +0100)]
proresdec: add UPDATE_CACHE, should fix decoding with -Os

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoRevert "h264: skip start code search if the size of the nal unit is known"
Janne Grunau [Mon, 19 Dec 2011 02:00:36 +0000 (03:00 +0100)]
Revert "h264: skip start code search if the size of the nal unit is known"

This reverts commit 87eebb3454ff0cd6af6ebf9e1d31bdfd1c3b601b.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 19 Dec 2011 01:11:50 +0000 (02:11 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  APIchanges: fill in revision for AVFrame.age deprecation
  avcodec: deprecate AVFrame.age
  4xm: remove unneeded check for remaining unused data.
  lavf: force threads to 1 in avformat_find_stream_info()
  swscale: fix overflows in vertical scaling at top/bottom edges.
  lavf: add OpenMG audio muxer.
  omadec: split data that will be used in the muxer to a separate file.
  lavf: rename oma.c -> omadec.c
  tmv decoder: set correct pix_fmt

Conflicts:
Changelog
doc/APIchanges
libavcodec/mpegvideo.c
libavcodec/version.h
libavformat/oma.c
libavformat/version.h
libswscale/swscale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswscale: fix formatting and indentation of unscaled conversion routines.
Nathan Adil Maxson [Sun, 18 Dec 2011 16:11:27 +0000 (08:11 -0800)]
swscale: fix formatting and indentation of unscaled conversion routines.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agorl2demux: Fix FPE
Michael Niedermayer [Sun, 18 Dec 2011 22:54:56 +0000 (23:54 +0100)]
rl2demux: Fix FPE
Fixes Ticket788
Bug found by Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: skip start code search if the size of the nal unit is known
Janne Grunau [Sun, 18 Dec 2011 21:42:36 +0000 (22:42 +0100)]
h264: skip start code search if the size of the nal unit is known

Start code emulation prevention is only required in Annex B bytestream
packed NAL units. For other coding formats the size is already known.
Looking for a start code prefix can result in false positives like in
http://streams.videolan.org/streams/mp4/Mr_MrsSmith-h264_aac.mp4
which has a false positive in the SPS.

7 years agocljr: fix buf_size sanity check
Paul B. Mahol [Sat, 17 Dec 2011 17:58:06 +0000 (17:58 +0000)]
cljr: fix buf_size sanity check

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
7 years agocljr: Check if width and height are positive integers
Shitiz Garg [Thu, 15 Dec 2011 22:20:21 +0000 (22:20 +0000)]
cljr: Check if width and height are positive integers

Width and height might get passed as 0 and would cause floating point
exceptions in decode_frame.
Fixes bugzilla #149

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
7 years agoAPIchanges: fill in revision for AVFrame.age deprecation
Mans Rullgard [Sun, 18 Dec 2011 22:15:04 +0000 (22:15 +0000)]
APIchanges: fill in revision for AVFrame.age deprecation

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoavcodec: deprecate AVFrame.age
Mans Rullgard [Sun, 18 Dec 2011 20:41:42 +0000 (20:41 +0000)]
avcodec: deprecate AVFrame.age

This was intended as an optimisation for skipped blocks in MPEG2
P-frames and never used elsewhere.  Removing this "optimisation"
speeds up MPEG2 decoding by 1-2% (ARM Cortex-A9).

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoMerge remote-tracking branch 'tjoppen/proper_mxf_track_linking'
Michael Niedermayer [Sun, 18 Dec 2011 22:10:58 +0000 (23:10 +0100)]
Merge remote-tracking branch 'tjoppen/proper_mxf_track_linking'

* tjoppen/proper_mxf_track_linking:
  mxfdec: Don't parse slices or DeltaEntryArrays
  mxfdec: Remove dead/useless code
  mxfdec: Hybrid demuxing/seeking solution
  mxfdec: Add mxf_edit_unit_absolute_offset()
  mxfdec: Replace zero IndexDurations with st->duration
  mxfdec: Add "fake" index to MXFIndexTable to assist seeking
  mxfdec: Add MXFIndexTables
  mxfdec: Move mxf_read_packet*() near the bottom of the file

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosiff: Fix excessive memory allocation.
Michael Niedermayer [Sun, 18 Dec 2011 21:43:19 +0000 (22:43 +0100)]
siff: Fix excessive memory allocation.
Bug found by: Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomov: detect EOF in mov_read_dref()
Michael Niedermayer [Sun, 18 Dec 2011 20:37:54 +0000 (21:37 +0100)]
mov: detect EOF in mov_read_dref()
This fixes a (near) infinite loop and Ticket783
Bug found by: cosminamironesei

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoadx_parser: rewrite.
Michael Niedermayer [Sun, 18 Dec 2011 19:12:16 +0000 (20:12 +0100)]
adx_parser: rewrite.
The previous code ended in multiple different infinite
loops. See stl_ten_1_big.sfd as example with and without zzuf

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoadxdec: Fix division by zero
Michael Niedermayer [Sun, 18 Dec 2011 19:10:51 +0000 (20:10 +0100)]
adxdec: Fix division by zero

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoadxdec: Do not require extradata.
Michael Niedermayer [Sun, 18 Dec 2011 19:10:30 +0000 (20:10 +0100)]
adxdec: Do not require extradata.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoadx_parser: Fix infinite loop.
Michael Niedermayer [Sun, 18 Dec 2011 17:57:56 +0000 (18:57 +0100)]
adx_parser: Fix infinite loop.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years ago4xm: remove unneeded check for remaining unused data.
Justin Ruggles [Sun, 18 Dec 2011 18:21:27 +0000 (13:21 -0500)]
4xm: remove unneeded check for remaining unused data.

This is unnecessary complication that only prints a message and does not
affect decoding.

7 years agolavf: force threads to 1 in avformat_find_stream_info()
Anton Khirnov [Tue, 6 Dec 2011 06:51:54 +0000 (07:51 +0100)]
lavf: force threads to 1 in avformat_find_stream_info()

Fixes avformat_find_stream_info() on streams with number of frames <
thread count.

7 years agoswscale: fix overflows in vertical scaling at top/bottom edges.
Ronald S. Bultje [Sun, 18 Dec 2011 16:27:43 +0000 (08:27 -0800)]
swscale: fix overflows in vertical scaling at top/bottom edges.

This fixes integer multiplication overflows in RGB48 output
(vertical) scaling as detected by IOC. What happens is that for
certain types of filters (lanczos, spline, bicubic), the
intermediate sum of coefficients in the middle of a filter can
be larger than the fixed-point equivalent of 1.0, even if the
final sum is 1.0. This is fine and we support that.

However, at frame edges, initFilter() will merge the coefficients
for the off-screen pixels into the top or bottom pixel, such as
to emulate edge extension. This means that suddenly, a single
coefficient can be larger than the fixed-point equivalent of
1.0, which the vertical scaling routines do not support.

Therefore, remove the merging of coefficients for edges for
the vertical scaling filter, and instead add edge detection
to the scaler itself so that it copies the pointers (not data)
for the edges (i.e. it uses line[0] for line[-1] as well), so
that a single coefficient is never larger than the fixed-point
equivalent of 1.0.

7 years agolavf: add OpenMG audio muxer.
Michael Karcher [Fri, 21 Oct 2011 21:32:33 +0000 (23:32 +0200)]
lavf: add OpenMG audio muxer.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agoomadec: split data that will be used in the muxer to a separate file.
Anton Khirnov [Sat, 17 Dec 2011 14:23:13 +0000 (15:23 +0100)]
omadec: split data that will be used in the muxer to a separate file.

7 years agolavf: rename oma.c -> omadec.c
Anton Khirnov [Sat, 17 Dec 2011 14:00:04 +0000 (15:00 +0100)]
lavf: rename oma.c -> omadec.c

7 years agotmv decoder: set correct pix_fmt
Uoti Urpala [Sun, 18 Dec 2011 14:17:07 +0000 (16:17 +0200)]
tmv decoder: set correct pix_fmt

Previously the decoder only worked if the user had set avctx->pix_fmt
manually. For some reason the libavformat tmv demuxer sets this, so
the problem was not visible in avplay etc.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agoFix channel order for some less common TrueHD layouts.
Carl Eugen Hoyos [Sun, 18 Dec 2011 14:28:18 +0000 (15:28 +0100)]
Fix channel order for some less common TrueHD layouts.

Reported and tested by TDiTP_

Fixes ticket #779.

7 years agomlpdec: fix channel order for wide 7.1 truehd layouts
Hendrik Leppkes [Sun, 18 Dec 2011 14:25:25 +0000 (15:25 +0100)]
mlpdec: fix channel order for wide 7.1 truehd layouts

7 years agoCosmetics: Fix indentation after last commit.
Carl Eugen Hoyos [Sun, 18 Dec 2011 13:22:13 +0000 (14:22 +0100)]
Cosmetics: Fix indentation after last commit.