]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Sat, 24 Dec 2011 23:10:27 +0000 (00:10 +0100)]
ws_snd1: Fix wrong samples count and crash.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 24 Dec 2011 22:21:40 +0000 (23:21 +0100)]
asfdec: fix endless loop on EOF
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 24 Dec 2011 21:06:25 +0000 (22:06 +0100)]
sierravmd: limit packetsize to the amount that could be read.
Fixes huge allocations.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 24 Dec 2011 21:03:59 +0000 (22:03 +0100)]
vmdav: check that theres enough space for a chunk remaining.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 24 Dec 2011 20:26:52 +0000 (21:26 +0100)]
rmdec: Avoid allocating huge packets
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 24 Dec 2011 19:27:54 +0000 (20:27 +0100)]
mpeg4videodec: Fix division by zero in mpeg4_decode_sprite_trajectory()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 24 Dec 2011 18:57:18 +0000 (19:57 +0100)]
rpl: Fix near infinite loop in index reading due to missing eof check.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 24 Dec 2011 05:17:12 +0000 (06:17 +0100)]
j2kdec: Fix crash in get_qcx
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 24 Dec 2011 04:06:20 +0000 (05:06 +0100)]
j2kdec: Check curtileno for validity
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 24 Dec 2011 04:03:04 +0000 (05:03 +0100)]
j2kdec: Check for interger overflow in tile array allocation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 24 Dec 2011 03:59:25 +0000 (04:59 +0100)]
j2kdec: fix division by zero, check tile dimensions for validity
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 24 Dec 2011 02:55:58 +0000 (03:55 +0100)]
lzo: fix memcpy_backptr() with 0 offset
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sat, 24 Dec 2011 15:17:18 +0000 (16:17 +0100)]
vf_drawtext: select YUV color for drawbox() in case YUV colorspace is used
Fix box alpha rendering when a YUV colorspace is selected, in particular
fix trac ticket #763.
Carl Eugen Hoyos [Sat, 24 Dec 2011 11:44:30 +0000 (12:44 +0100)]
Make the palette in Quake II CIN files opaque and increase its dynamics.
Carl Eugen Hoyos [Sat, 24 Dec 2011 11:41:44 +0000 (12:41 +0100)]
Make the palette in Wing Commander III mve files opaque.
Carl Eugen Hoyos [Sat, 24 Dec 2011 11:38:32 +0000 (12:38 +0100)]
Make mov palette opaque or load alpha if present.
Carl Eugen Hoyos [Sat, 24 Dec 2011 02:41:50 +0000 (03:41 +0100)]
Make the avi palette opaque.
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>
Alexander Strasser [Sat, 24 Dec 2011 00:28:30 +0000 (01:28 +0100)]
build: Try to find fate_config.sh.template in source path
The FATE documentation depends on the mentioned file. But that
did break out of tree builds because the file was not found.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jean First [Thu, 22 Dec 2011 21:26:21 +0000 (22:26 +0100)]
libopenjpeg: support decoding with bits per pixel greater than 8
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Approved-by: Alex Zhukov
Michael Niedermayer [Sat, 24 Dec 2011 00:54:25 +0000 (01:54 +0100)]
Merge remote-tracking branch 'shariman/wmall'
* shariman/wmall:
Perform dequantization of channel coefficients
Perform inverse inter-channel decorrelation and ac-filter
Implement revert_inter_ch_decorr() and revert_acfilter()
Enable inverse-MCLMS filter
Fix inverse-MCLMS filtering routines
Do not update buffers in case no speed change is necessary
Use int for channel_coeffs instead of int16_t
Conflicts:
libavcodec/wmalosslessdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 24 Dec 2011 00:13:46 +0000 (01:13 +0100)]
release_notes: merge back changes from our 0.9 to master
seems i have forgotten this
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 11 Dec 2011 20:11:40 +0000 (21:11 +0100)]
RELEASE_NOTES: remove possibly ofensive sounding wording
from after the merge that i missed and do other general cleanup
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 23 Dec 2011 23:45:02 +0000 (00:45 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vp3dec: Check coefficient index in vp3_dequant()
svq1dec: call avcodec_set_dimensions() after dimensions changed.
Prepare for 0.8_beta1 snapshot release
threads: check defines before using them in automatic thread detection
pthread: include sys/types.h before sys/sysctl.h
4xm: remove unused variables.
h264: Fix a possible overread in decode_nal_units()
allfilters: fix type of avfilter_vsrc_buffer.
w32thread: call ResetEvent() in pthread_cond_broadcast().
Conflicts:
Changelog
RELEASE
doc/RELEASE_NOTES
libavcodec/pthread.c
libavcodec/vp3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 23 Dec 2011 22:59:10 +0000 (23:59 +0100)]
avio: fix handling of , in urls
Fixes Ticket805
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 23 Dec 2011 22:26:02 +0000 (23:26 +0100)]
swr: fix swresample_version()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 23 Dec 2011 18:52:15 +0000 (19:52 +0100)]
flvdec: disable new midstream param change code not only for h264 but all cases.
It breaks some samples and iam not aware of one that it fixes.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 23 Dec 2011 17:01:10 +0000 (18:01 +0100)]
Revert "doc: build: TEXIDEP: Recognize verbatim includes"
This reverts commit
e5cbf24e45ed21178674fff8f485d919128b793c .
This commits breaks out of tree builds
Michael Niedermayer [Fri, 23 Dec 2011 15:34:46 +0000 (16:34 +0100)]
pthread: sysctl.h needs param.h on openbsd
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Fri, 23 Dec 2011 10:10:37 +0000 (11:10 +0100)]
threads: check defines before using them in automatic thread detection
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Fri, 23 Dec 2011 09:14:15 +0000 (10:14 +0100)]
pthread: include sys/types.h before sys/sysctl.h
Fixes compilation on FreeBSD with clang 3.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reinhard Tartler [Sun, 4 Dec 2011 09:10:33 +0000 (10:10 +0100)]
vp3dec: Check coefficient index in vp3_dequant()
Based on a patch by Michael Niedermayer <michaelni@gmx.at>
Fixes NGS00145, CVE-2011-4352
Found-by: Phillip Langlois
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Michael Niedermayer [Fri, 18 Nov 2011 18:10:21 +0000 (19:10 +0100)]
svq1dec: call avcodec_set_dimensions() after dimensions changed.
Fixes NGS00148, CVE-2011-4579
Found-by: Phillip Langlois
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reinhard Tartler [Sun, 6 Nov 2011 10:12:04 +0000 (11:12 +0100)]
Prepare for 0.8_beta1 snapshot release
Janne Grunau [Fri, 23 Dec 2011 10:10:37 +0000 (11:10 +0100)]
threads: check defines before using them in automatic thread detection
Janne Grunau [Fri, 23 Dec 2011 09:14:15 +0000 (10:14 +0100)]
pthread: include sys/types.h before sys/sysctl.h
Fixes compilation on FreeBSD with clang 3.
Carl Eugen Hoyos [Fri, 23 Dec 2011 10:43:29 +0000 (11:43 +0100)]
Make systematic palette opaque.
Carl Eugen Hoyos [Fri, 23 Dec 2011 10:39:41 +0000 (11:39 +0100)]
Release buffers after encoding svq1.
Fixes ticket #820.
Carl Eugen Hoyos [Fri, 23 Dec 2011 10:38:37 +0000 (11:38 +0100)]
Fix a possible endless loop when decoding aac.
Fixes ticket #789.
Anton Khirnov [Thu, 22 Dec 2011 14:40:26 +0000 (15:40 +0100)]
4xm: remove unused variables.
Alexander Strange [Mon, 12 Dec 2011 23:13:39 +0000 (18:13 -0500)]
h264: Fix a possible overread in decode_nal_units()
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Mashiat Sarker Shakkhar [Fri, 23 Dec 2011 07:21:33 +0000 (13:21 +0600)]
Perform dequantization of channel coefficients
Mashiat Sarker Shakkhar [Fri, 23 Dec 2011 07:23:10 +0000 (13:23 +0600)]
Perform inverse inter-channel decorrelation and ac-filter
Mashiat Sarker Shakkhar [Fri, 23 Dec 2011 07:17:28 +0000 (13:17 +0600)]
Implement revert_inter_ch_decorr() and revert_acfilter()
Anton Khirnov [Thu, 22 Dec 2011 16:32:29 +0000 (17:32 +0100)]
allfilters: fix type of avfilter_vsrc_buffer.
Michael Niedermayer [Fri, 23 Dec 2011 05:01:20 +0000 (06:01 +0100)]
libavfilter: increase LIBAVFILTER_VERSION_MICRO to 100 like the other libs.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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>
Sergey Radionov [Fri, 23 Dec 2011 03:37:48 +0000 (10:37 +0700)]
w32thread: call ResetEvent() in pthread_cond_broadcast().
Also add "volatile" to broadcast flag (since it is used from
multiple threads).
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
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>
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>
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>
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>
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.
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.
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.
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>
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>
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>
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>
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.
Janne Grunau [Thu, 22 Dec 2011 20:10:07 +0000 (21:10 +0100)]
bsd: use number of logical 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
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.
Janne Grunau [Wed, 21 Dec 2011 12:07:54 +0000 (13:07 +0100)]
pthreads: reset active_thread_type when slice thread_init returrns early
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>
Mashiat Sarker Shakkhar [Thu, 22 Dec 2011 10:47:30 +0000 (16:47 +0600)]
Enable inverse-MCLMS filter
Mashiat Sarker Shakkhar [Thu, 22 Dec 2011 17:48:02 +0000 (23:48 +0600)]
Fix inverse-MCLMS filtering routines
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.
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.
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.
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>
Stefano Sabatini [Thu, 22 Dec 2011 09:43:54 +0000 (10:43 +0100)]
platform.texi: close @enumerate section in the "Using shared libraries" subsection
Anton Khirnov [Wed, 21 Dec 2011 05:41:57 +0000 (06:41 +0100)]
sws: readd PAL8 to isPacked()
Fixes PAL8 to YUV conversion.
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>
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.
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.
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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
Tim Nicholson [Wed, 21 Dec 2011 17:12:05 +0000 (17:12 +0000)]
Clearer explanation of audio channel mapping restrictions
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
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.
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>
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>
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>
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>