ffmpeg.git
8 years agoh264: Decode short VUI without error
Michael Niedermayer [Fri, 23 Dec 2011 04:58:32 +0000 (05:58 +0100)]
h264: Decode short VUI without error
Fixes 47j9R7PXBep.mov

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 23 Dec 2011 02:00:12 +0000 (03:00 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: fix standalone compilation of OMA muxer
  build: fix standalone compilation of Microsoft XMV demuxer
  build: fix standalone compilation of Core Audio Format demuxer
  kvmc: fix invalid reads
  4xm: Add a check in decode_i_frame to prevent buffer overreads
  adpcm: fix IMA SMJPEG decoding
  options: set minimum for "threads" to zero
  bsd: use number of logical CPUs as automatic thread count
  windows: use number of CPUs as automatic thread count
  linux: use number of CPUs as automatic thread count
  pthreads: reset active_thread_type when slice thread_init returrns early
  v410dec: include correct headers
  Drop ALT_ prefix from BITSTREAM_READER_LE name.
  lavfi: always build vsrc_buffer.
  ra144enc: zero the reflection coeffs if the filter is unstable
  sws: readd PAL8 to isPacked()
  mov: Don't stick the QuickTime field ordering atom in extradata.
  truespeech: fix invalid reads in truespeech_apply_twopoint_filter()

Conflicts:
configure
libavcodec/4xm.c
libavcodec/avcodec.h
libavfilter/Makefile
libavfilter/allfilters.c
libavformat/Makefile
libswscale/swscale_internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoudp: support non blocking reads with fifo
Michael Niedermayer [Fri, 23 Dec 2011 00:51:47 +0000 (01:51 +0100)]
udp: support non blocking reads with fifo

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoudp: Replace double select() by select+mutex+cond.
Michael Niedermayer [Fri, 23 Dec 2011 00:17:18 +0000 (01:17 +0100)]
udp: Replace double select() by select+mutex+cond.

When no data was available both the buffer thread as well as
the main thread would block in select(), when data becomes
available both should move forward and as data is read in the
buffer thread the main thread would block in select() later
the read data was put in the fifo but the main thread still
would be blocked in select() until either the timeout or
another packet would come in.

This is solved in this commit by using a mutex and a condition
variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoudp: return circular buffer error if such error happened.
Michael Niedermayer [Fri, 23 Dec 2011 00:41:15 +0000 (01:41 +0100)]
udp: return circular buffer error if such error happened.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agobuild: fix standalone compilation of OMA muxer
Diego Biurrun [Thu, 22 Dec 2011 20:10:38 +0000 (21:10 +0100)]
build: fix standalone compilation of OMA muxer

The muxer depends on the id3v2 writing code, so link against it.

8 years agobuild: fix standalone compilation of Microsoft XMV demuxer
Diego Biurrun [Thu, 22 Dec 2011 20:09:23 +0000 (21:09 +0100)]
build: fix standalone compilation of Microsoft XMV demuxer

The demuxer depends on the RIFF codec tags code, so link against it.

8 years agobuild: fix standalone compilation of Core Audio Format demuxer
Diego Biurrun [Thu, 22 Dec 2011 20:05:26 +0000 (21:05 +0100)]
build: fix standalone compilation of Core Audio Format demuxer

The demuxer depends on code from mov.c, which in turn depends on
code from mov_chan.c, so link against it.

8 years agofifo: Make writes atomic.
Michael Niedermayer [Thu, 22 Dec 2011 23:18:36 +0000 (00:18 +0100)]
fifo: Make writes atomic.
Prior to this a X bytes write could be seen as less than X bytes being
available if the check was done at an unfortunate moment.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agokvmc: fix invalid reads
Gaurav Narula [Mon, 12 Dec 2011 14:54:54 +0000 (20:24 +0530)]
kvmc: fix invalid reads

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
8 years ago4xm: Add a check in decode_i_frame to prevent buffer overreads
Shitiz Garg [Wed, 14 Dec 2011 12:59:21 +0000 (18:29 +0530)]
4xm: Add a check in decode_i_frame to prevent buffer overreads

Fixes bugzilla #135

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
8 years agoadpcm: fix IMA SMJPEG decoding
Paul B Mahol [Wed, 21 Dec 2011 19:27:53 +0000 (19:27 +0000)]
adpcm: fix IMA SMJPEG decoding

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
8 years agooptions: set minimum for "threads" to zero
Janne Grunau [Wed, 21 Dec 2011 00:37:44 +0000 (01:37 +0100)]
options: set minimum for "threads" to zero

A negative number of threads does not make sense and 0 is used for
autodetection. Adds a symbolic name for autodetection.

8 years agobsd: use number of logical CPUs as automatic thread count
Janne Grunau [Thu, 22 Dec 2011 20:10:07 +0000 (21:10 +0100)]
bsd: use number of logical CPUs as automatic thread count

8 years agowindows: use number of CPUs as automatic thread count
Janne Grunau [Wed, 21 Dec 2011 00:26:19 +0000 (01:26 +0100)]
windows: use number of CPUs as automatic thread count

8 years agolinux: use number of CPUs as automatic thread count
Janne Grunau [Wed, 21 Dec 2011 00:18:01 +0000 (01:18 +0100)]
linux: use number of CPUs as automatic thread count

Use sched_getaffinity to determine the number of logical CPUs.
Limits the number of threads to 16 since slice threading of H.264
seems to be buggy with more than 16 threads.

8 years agopthreads: reset active_thread_type when slice thread_init returrns early
Janne Grunau [Wed, 21 Dec 2011 12:07:54 +0000 (13:07 +0100)]
pthreads: reset active_thread_type when slice thread_init returrns early

8 years agov410dec: include correct headers
Paul B. Mahol [Wed, 21 Dec 2011 00:19:12 +0000 (00:19 +0000)]
v410dec: include correct headers

This file does not use anything from get_bits.h but needs
intreadwrite.h.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
8 years agoDrop ALT_ prefix from BITSTREAM_READER_LE name.
Diego Biurrun [Thu, 22 Dec 2011 15:33:31 +0000 (16:33 +0100)]
Drop ALT_ prefix from BITSTREAM_READER_LE name.

The prefix is a historic remnant that probably meant "alternative".
Now that the A32 bitstream reader has been dropped it makes no sense anymore.

8 years agolavfi: always build vsrc_buffer.
Anton Khirnov [Wed, 21 Dec 2011 19:47:52 +0000 (20:47 +0100)]
lavfi: always build vsrc_buffer.

It's a part of public API.

8 years agora144enc: zero the reflection coeffs if the filter is unstable
Justin Ruggles [Wed, 21 Dec 2011 21:09:11 +0000 (16:09 -0500)]
ra144enc: zero the reflection coeffs if the filter is unstable

fixes use of uninitialized values if the filter is still unstable after using
the previous frame lpc coefficients.

8 years agoMerge remote-tracking branch 'tjoppen/fuzz_fixes'
Michael Niedermayer [Thu, 22 Dec 2011 13:04:42 +0000 (14:04 +0100)]
Merge remote-tracking branch 'tjoppen/fuzz_fixes'

* tjoppen/fuzz_fixes:
  mxfdec: Don't crash in mxf_packet_timestamps() if current_edit_unit overflows
  mxfdec: Zero nb_ptses in mxf_compute_ptses_fake_index()
  mxfdec: Sanity check PreviousPartition
  mxfdec: Never seek back in local sets and KLVs
  mxfdec: Move the current_partition check inside mxf_read_header()
  mxfdec: Fix infinite loop in mxf_packet_timestamps()
  mxfdec: Check url_feof() in mxf_read_local_tags()
  mxfdec: Check for NULL component

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoplatform.texi: close @enumerate section in the "Using shared libraries" subsection
Stefano Sabatini [Thu, 22 Dec 2011 09:43:54 +0000 (10:43 +0100)]
platform.texi: close @enumerate section in the "Using shared libraries" subsection

8 years agosws: readd PAL8 to isPacked()
Anton Khirnov [Wed, 21 Dec 2011 05:41:57 +0000 (06:41 +0100)]
sws: readd PAL8 to isPacked()

Fixes PAL8 to YUV conversion.

8 years agolavd/lavfi: fix two memleaks.
Nicolas George [Thu, 15 Dec 2011 18:51:38 +0000 (19:51 +0100)]
lavd/lavfi: fix two memleaks.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
8 years agosink_buffer: copy list of provided formats in the context
Stefano Sabatini [Tue, 20 Dec 2011 12:08:57 +0000 (13:08 +0100)]
sink_buffer: copy list of provided formats in the context

A list of formats may have been dynamically created by the calling code,
and thus should not be referenced by the sink buffer context.

Avoid possible invalid data reference.

8 years agomov: Don't stick the QuickTime field ordering atom in extradata.
Alex Converse [Wed, 14 Dec 2011 02:49:06 +0000 (18:49 -0800)]
mov: Don't stick the QuickTime field ordering atom in extradata.

The 'fiel' atoms can be found in H.264 tracks clobbering the extradata.
MJPEG supports non field based extradata, and this data should be
preserved when copying.

8 years agolibswresample.v: add swresample* for cmdutils.c
Michael Niedermayer [Thu, 22 Dec 2011 03:47:52 +0000 (04:47 +0100)]
libswresample.v: add swresample* for cmdutils.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavf: Add SMJPEG demuxer.
Paul B Mahol [Mon, 19 Dec 2011 00:16:11 +0000 (00:16 +0000)]
lavf: Add SMJPEG demuxer.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 years agotruespeech: fix invalid reads in truespeech_apply_twopoint_filter()
Justin Ruggles [Wed, 21 Dec 2011 23:13:06 +0000 (18:13 -0500)]
truespeech: fix invalid reads in truespeech_apply_twopoint_filter()

fixes Bug 171

8 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

8 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

8 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.

8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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.

8 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.

8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 years agomxfdec: Don't crash in mxf_packet_timestamps() if current_edit_unit overflows
Tomas Härdin [Wed, 21 Dec 2011 11:00:04 +0000 (12:00 +0100)]
mxfdec: Don't crash in mxf_packet_timestamps() if current_edit_unit overflows

8 years agomxfdec: Zero nb_ptses in mxf_compute_ptses_fake_index()
Tomas Härdin [Wed, 21 Dec 2011 10:58:01 +0000 (11:58 +0100)]
mxfdec: Zero nb_ptses in mxf_compute_ptses_fake_index()

This fixes SIGSEGV on files with both CBR and VBR index segments (zzuf6.mxf).

8 years agomxfdec: Sanity check PreviousPartition
Tomas Härdin [Wed, 21 Dec 2011 09:56:59 +0000 (10:56 +0100)]
mxfdec: Sanity check PreviousPartition

Without this certain files could get the demuxer stuck in a loop

8 years agomxfdec: Never seek back in local sets and KLVs
Tomas Härdin [Wed, 21 Dec 2011 09:49:27 +0000 (10:49 +0100)]
mxfdec: Never seek back in local sets and KLVs

Specially crafted files can lead the parsing code to take too long.
We fix a lot of these problems by not allowing local tags to extend past the
end of the set and not allowing other KLVs to be read past the end of
themselves.

8 years agomxfdec: Move the current_partition check inside mxf_read_header()
Tomas Härdin [Tue, 20 Dec 2011 17:11:10 +0000 (18:11 +0100)]
mxfdec: Move the current_partition check inside mxf_read_header()

This fixes SIGSEGV on files where this is actually the case, such as zzuf4.mxf

8 years agomxfdec: Fix infinite loop in mxf_packet_timestamps()
Tomas Härdin [Tue, 20 Dec 2011 17:04:13 +0000 (18:04 +0100)]
mxfdec: Fix infinite loop in mxf_packet_timestamps()

This can happen if an index table segment has a very large IndexStartPosition.
zzuf3.mxf is an example of such a file.

8 years agomxfdec: Check url_feof() in mxf_read_local_tags()
Tomas Härdin [Tue, 20 Dec 2011 16:39:59 +0000 (17:39 +0100)]
mxfdec: Check url_feof() in mxf_read_local_tags()

This fixes the infinite loop with zzuf2.mxf

8 years agomxfdec: Check for NULL component
Tomas Härdin [Tue, 20 Dec 2011 16:38:27 +0000 (17:38 +0100)]
mxfdec: Check for NULL component

This fixes SIGSEGV with zzuf1.mxf

8 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.

8 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.

8 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.

8 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>
8 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>
8 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>
8 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.

8 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>
8 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.

8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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

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

8 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.

8 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.

8 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.

8 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.

8 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>