ffmpeg.git
7 years agocmdutils: restore vertical alignment of versions
Michael Niedermayer [Thu, 22 Dec 2011 02:23:48 +0000 (03:23 +0100)]
cmdutils: restore vertical alignment of versions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocmdutils: print swr versions too
Michael Niedermayer [Thu, 22 Dec 2011 02:09:58 +0000 (03:09 +0100)]
cmdutils: print swr versions too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: increase LIBSWRESAMPLE_VERSION_MICRO to 100
Michael Niedermayer [Thu, 22 Dec 2011 02:09:41 +0000 (03:09 +0100)]
swr: increase LIBSWRESAMPLE_VERSION_MICRO to 100

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr: add swresample_version swresample_configuration and swresample_license
Michael Niedermayer [Thu, 22 Dec 2011 02:08:47 +0000 (03:08 +0100)]
swr: add swresample_version  swresample_configuration and swresample_license

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibswscale: increase LIBSWSCALE_VERSION_MICRO to 100
Michael Niedermayer [Thu, 22 Dec 2011 02:07:57 +0000 (03:07 +0100)]
libswscale: increase LIBSWSCALE_VERSION_MICRO to 100

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibpostproc: increase LIBPOSTPROC_VERSION_MICRO to 100
Michael Niedermayer [Thu, 22 Dec 2011 02:07:13 +0000 (03:07 +0100)]
libpostproc: increase LIBPOSTPROC_VERSION_MICRO to 100

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibavdevice: increase LIBAVDEVICE_VERSION_MICRO to 100
Michael Niedermayer [Thu, 22 Dec 2011 02:06:33 +0000 (03:06 +0100)]
libavdevice: increase LIBAVDEVICE_VERSION_MICRO to 100

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibavformat: increase LIBAVFORMAT_VERSION_MICRO to 100
Michael Niedermayer [Thu, 22 Dec 2011 02:06:06 +0000 (03:06 +0100)]
libavformat: increase LIBAVFORMAT_VERSION_MICRO to 100
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibavutil: increase LIBAVUTIL_VERSION_MICRO to 100
Michael Niedermayer [Thu, 22 Dec 2011 02:00:49 +0000 (03:00 +0100)]
libavutil: increase LIBAVUTIL_VERSION_MICRO to 100

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc: make 100 the base for the micro version number.
Michael Niedermayer [Sat, 17 Dec 2011 05:25:12 +0000 (06:25 +0100)]
lavc: make 100 the base for the micro version number.
This way ffmpeg can be distinguished from the fork by a user
application or a encoded file by a decoder.
The highest value micro had, in the past, that i could find, was 6
thus 100 should be safe.

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

* qatar/master: (27 commits)
  asfdec: add side data to ASFStream packet instead of output packet.
  idroqdec: set AVFMTCTX_NOHEADER and create streams as they occur.
  nellymoserdec: Indicate that the decoder can handle changed parameters
  libavcodec: Apply parameter change side data when decoding audio
  flvdec: Add param change side data if the sample rate or channels have changed
  libavformat: Add a utility function for adding parameter change side data
  libavcodec: Define a side data type for parameter changes
  aacdec: Handle new extradata passed as side data
  flvdec: Export new AAC/H.264 extradata as side data on the next packet
  libavcodec: Define a side data type for new extradata
  flacdec: skip all track indices at once instead of looping.
  mxf: Add PictureEssenceCoding UL for V210.
  mxfdec: consider QuantizationBits between 17 and 24 to be pcm_s24*
  mxfenc: Add support for MPEG-2 MP@HL-14 in mxf container.
  mxf: H.264/MPEG-4 AVC Intra support
  configure: Show whether the safe bitstream reader is enabled
  x86: Tighten register constraints for decode_significance*_x86.
  Replace Subversion revisions in comments by Git hashes.
  h264_cabac: synchronize decode_significance_*_x86 conditionals
  w32threads: wait for the waked thread in pthread_cond_signal.
  ...

Conflicts:
libavcodec/avcodec.h
libavcodec/version.h
libavformat/flvdec.c
libavformat/utils.c
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 agoasfdec: add side data to ASFStream packet instead of output packet.
Justin Ruggles [Tue, 20 Dec 2011 04:16:51 +0000 (23:16 -0500)]
asfdec: add side data to ASFStream packet instead of output packet.

fixes memleak of side data

7 years agoidroqdec: set AVFMTCTX_NOHEADER and create streams as they occur.
Justin Ruggles [Tue, 20 Dec 2011 04:53:04 +0000 (23:53 -0500)]
idroqdec: set AVFMTCTX_NOHEADER and create streams as they occur.

This fixes demuxing of file where the first packet is not audio. Such files
are generated by our idroq muxer. It also fixes demuxing of audio only
idroq files.

7 years agonellymoserdec: Indicate that the decoder can handle changed parameters
Martin Storsjö [Fri, 16 Dec 2011 14:10:02 +0000 (16:10 +0200)]
nellymoserdec: Indicate that the decoder can handle changed parameters

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agolibavcodec: Apply parameter change side data when decoding audio
Martin Storsjö [Fri, 16 Dec 2011 10:59:26 +0000 (12:59 +0200)]
libavcodec: Apply parameter change side data when decoding audio

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoflvdec: Add param change side data if the sample rate or channels have changed
Martin Storsjö [Fri, 16 Dec 2011 10:48:24 +0000 (12:48 +0200)]
flvdec: Add param change side data if the sample rate or channels have changed

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agolibavformat: Add a utility function for adding parameter change side data
Martin Storsjö [Fri, 16 Dec 2011 10:48:09 +0000 (12:48 +0200)]
libavformat: Add a utility function for adding parameter change side data

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agolibavcodec: Define a side data type for parameter changes
Martin Storsjö [Thu, 15 Dec 2011 16:30:03 +0000 (18:30 +0200)]
libavcodec: Define a side data type for parameter changes

Also define a codec capability for codecs that can handle
parameters changed externally between decoded packets.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoaacdec: Handle new extradata passed as side data
Martin Storsjö [Thu, 15 Dec 2011 14:53:19 +0000 (16:53 +0200)]
aacdec: Handle new extradata passed as side data

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoflvdec: Export new AAC/H.264 extradata as side data on the next packet
Martin Storsjö [Thu, 15 Dec 2011 14:29:55 +0000 (16:29 +0200)]
flvdec: Export new AAC/H.264 extradata as side data on the next packet

Compared to just overwriting the old extradata, this has the
advantage of letting the decoder know exactly when the
extradata changed (otherwise it is changed immediately when the
new extradata packet is demuxed, even if there's old queued packets
awaiting to be decoded). This makes it easier for decoders to
actually react to the change, so they won't have to inspect
the extradata for each packet to see if it might have changed.

This works when sequentially playing a file with sample rate
changes, but if seeking past a new extradata packet in the
file, it obviously doesn't work properly. That case doesn't
work in flash player either, so it's probably ok not to handle
it.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agolibavcodec: Define a side data type for new extradata
Martin Storsjö [Thu, 15 Dec 2011 14:11:49 +0000 (16:11 +0200)]
libavcodec: Define a side data type for new extradata

Signed-off-by: Martin Storsjö <martin@martin.st>
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 agoflacdec: skip all track indices at once instead of looping.
Paul B Mahol [Sat, 10 Dec 2011 19:42:46 +0000 (14:42 -0500)]
flacdec: skip all track indices at once instead of looping.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
7 years agomxf: Add PictureEssenceCoding UL for V210.
Tomas Härdin [Mon, 26 Sep 2011 09:24:11 +0000 (11:24 +0200)]
mxf: Add PictureEssenceCoding UL for V210.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
7 years agomxfdec: consider QuantizationBits between 17 and 24 to be pcm_s24*
Tomas Härdin [Tue, 27 Sep 2011 09:14:59 +0000 (11:14 +0200)]
mxfdec: consider QuantizationBits between 17 and 24 to be pcm_s24*

This fixes playback of BRD38772509.mxf.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
7 years agomxfenc: Add support for MPEG-2 MP@HL-14 in mxf container.
Daniel Kristjansson [Fri, 16 Sep 2011 16:16:30 +0000 (18:16 +0200)]
mxfenc: Add support for MPEG-2 MP@HL-14 in mxf container.

Support Main Profile at High 1440 Level in MXF container,
using essence coding label from SMPTE RDD 9, table 6.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
7 years agomxf: H.264/MPEG-4 AVC Intra support
Baptiste Coudurier [Sun, 14 Aug 2011 22:40:54 +0000 (00:40 +0200)]
mxf: H.264/MPEG-4 AVC Intra support

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
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 agoconfigure: Show whether the safe bitstream reader is enabled
Martin Storsjö [Wed, 21 Dec 2011 13:32:39 +0000 (15:32 +0200)]
configure: Show whether the safe bitstream reader is enabled

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agox86: Tighten register constraints for decode_significance*_x86.
Diego Biurrun [Wed, 21 Dec 2011 10:39:39 +0000 (11:39 +0100)]
x86: Tighten register constraints for decode_significance*_x86.

On 32-bit OS X with gcc 4.0/4.2 and shared libraries enabled, the ebx register
is not available, but required to assemble the functions.

This reverts commit 8742a4f to a simplified version of the original constraints.

7 years agoReplace Subversion revisions in comments by Git hashes.
Diego Biurrun [Tue, 20 Dec 2011 22:51:55 +0000 (23:51 +0100)]
Replace Subversion revisions in comments by Git hashes.

7 years agoh264_cabac: synchronize decode_significance_*_x86 conditionals
Diego Biurrun [Tue, 20 Dec 2011 17:57:30 +0000 (18:57 +0100)]
h264_cabac: synchronize decode_significance_*_x86 conditionals

The definition and the call site where under different #ifdefs.

7 years agow32threads: wait for the waked thread in pthread_cond_signal.
Sergey Radionov [Wed, 21 Dec 2011 02:08:56 +0000 (09:08 +0700)]
w32threads: wait for the waked thread in pthread_cond_signal.

This fixes a deadlock VLC triggered with multithreaded decoding. The
wait forces one of the current waiters to wake and not the thread
which calls pthread_cond_signal() itself.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
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 agoaacdec: Cleanup decode_ics_info.
Alex Converse [Tue, 20 Dec 2011 18:36:27 +0000 (10:36 -0800)]
aacdec: Cleanup decode_ics_info.

Remove unused function argument.
Return an AVERROR.
Don't zero out ICS on failure.

7 years agonetwork: properly declare WSADATA in windows
Sergey Radionov [Wed, 21 Dec 2011 02:19:10 +0000 (09:19 +0700)]
network: properly declare WSADATA in windows

Fixed "ISO C90 forbids mixed declarations and code" in ff_network_init

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agofate: account for NUT 10bit support
Luca Barbato [Wed, 21 Dec 2011 01:50:57 +0000 (02:50 +0100)]
fate: account for NUT 10bit support

Some libavifilter tests use NUT as output even if the produced
files were not decodable. The support for 10bit introduced in
432f0e5b7d and 91b1e6f0c changed the hashes.

7 years agobuild: error on mixed declarations and code
Mans Rullgard [Tue, 20 Dec 2011 16:32:06 +0000 (16:32 +0000)]
build: error on mixed declarations and code

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agopostproc: altivec: fix remaining mixed declarations and code
Mans Rullgard [Tue, 20 Dec 2011 19:07:49 +0000 (19:07 +0000)]
postproc: altivec: fix remaining mixed declarations and code

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agopostproc: altivec: untemplate some variable names
Mans Rullgard [Tue, 20 Dec 2011 19:03:25 +0000 (19:03 +0000)]
postproc: altivec: untemplate some variable names

These variables are now in separate scopes and thus do not
need unique names.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agopostproc: altivec: fix trivial cases of mixed declarations and code
Mans Rullgard [Tue, 20 Dec 2011 18:31:43 +0000 (18:31 +0000)]
postproc: altivec: fix trivial cases of mixed declarations and code

This moves declarations without initialisers or with constant
initialisers to the start of a block, and adds do {} while(0)
around some macros, thus allowing declarations within them.

Signed-off-by: Mans Rullgard <mans@mansr.com>
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>