Michael Niedermayer [Wed, 20 Feb 2013 23:21:47 +0000 (00:21 +0100)]
brender_pix: use a grayscale palette as fallback instead of a uninitialized one.
Improves: 3-0-CORPSE.PIX
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 20 Feb 2013 23:00:51 +0000 (00:00 +0100)]
mjpegdec: check for packed rgb mjpeg.
Fixes null pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Wed, 20 Feb 2013 21:54:21 +0000 (22:54 +0100)]
Fix bits_per_coded_sample when encoding png with frame-level multithreading.
Fixes ticket #2290.
Clément Bœsch [Wed, 20 Feb 2013 20:43:55 +0000 (21:43 +0100)]
lavf/swfdec: support 8-bits PCM audio.
Clément Bœsch [Wed, 20 Feb 2013 20:40:52 +0000 (21:40 +0100)]
lavf/swfdec: factorize the creation of a new stream.
This also makes the changes of
a3949fe11 applicable in both cases.
Michael Niedermayer [Wed, 20 Feb 2013 18:43:58 +0000 (19:43 +0100)]
h264: Fix handling of changing reference counts between slices
Fixes out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 20 Feb 2013 16:25:04 +0000 (17:25 +0100)]
h264: call alloc_scratch_buffers() only once linesize is known
Fixes out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Wed, 20 Feb 2013 18:47:32 +0000 (19:47 +0100)]
lavfi/subtitles: fix recently introduced warning about discarded const qualifier.
Stefano Sabatini [Tue, 19 Feb 2013 22:07:31 +0000 (23:07 +0100)]
lavfi/overlay: add format option
In particular, fix misbehavior in case main and overlay input formats
mismatch (e.g. YUV420 and YUV444).
Stefano Sabatini [Mon, 18 Feb 2013 13:37:30 +0000 (14:37 +0100)]
lavfi/overlay: apply minor consistency fixes
Stefano Sabatini [Thu, 14 Feb 2013 23:26:22 +0000 (00:26 +0100)]
lavfi/overlay: implement shortest option
Force termination when the overlay stream ends. Simplify scripting logic,
for example when an infinite source is used to generate a background for
a composite video.
Stefano Sabatini [Wed, 20 Feb 2013 18:11:19 +0000 (19:11 +0100)]
doc/filters: rework introductory description for decimate
In particular, dedicate first paragraph to deliver a short description of
the filter.
Stefano Sabatini [Wed, 20 Feb 2013 14:02:42 +0000 (15:02 +0100)]
lavfi/decimate: use named options
Stefano Sabatini [Wed, 20 Feb 2013 14:47:12 +0000 (15:47 +0100)]
doc/filters: apply misc fixes to drawbox documentation
Michael Niedermayer [Wed, 20 Feb 2013 14:45:50 +0000 (15:45 +0100)]
mov: fix self referencing timecode tracks
Fixes read after free.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 20 Feb 2013 11:34:05 +0000 (12:34 +0100)]
avfilter: fix segfault with setsar/dar
Reported-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 20 Feb 2013 11:04:45 +0000 (12:04 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
intreadwrite: tomi: Add missing attributes.h #include for av_always_inline
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sun, 10 Feb 2013 20:32:37 +0000 (21:32 +0100)]
lavf/matroskaenc: avoid assert failure in case of cuepoints with duplicated PTS
Avoid to write more than one cuepoint per track and PTS in
mkv_write_cues(). This avoids a later assertion failure on "(bytes >=
needed_bytes)" in put_ebml_num() called from end_ebml_master(), in case
there are several cuepoints per track with the same PTS.
This may happen with files containing packets with duplicated PTS in the
same track.
Michael Niedermayer [Wed, 20 Feb 2013 10:54:06 +0000 (11:54 +0100)]
Merge commit '
8a11ce43d08352f7a290355ebb5b29c495ad9609'
* commit '
8a11ce43d08352f7a290355ebb5b29c495ad9609':
build: Ensure that output directories for header objects are created
h264: Get rid of unnecessary casts
Conflicts:
common.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 20 Feb 2013 10:50:01 +0000 (11:50 +0100)]
Merge commit '
fae6fd5b873911cfcd7f7b3d72de6598af5e003a'
* commit '
fae6fd5b873911cfcd7f7b3d72de6598af5e003a':
h264/svq3: Stop using draw_edges
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 20 Feb 2013 10:47:32 +0000 (11:47 +0100)]
Merge commit '
7ebfb466aec2c4628fcd42a72b29034efcaba4bc'
* commit '
7ebfb466aec2c4628fcd42a72b29034efcaba4bc':
h264: Don't store intra pcm samples in h->mb
get_bits: Return pointer to buffer that is the result of the alignment
Conflicts:
libavcodec/h264_mb_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Tue, 19 Feb 2013 22:45:12 +0000 (23:45 +0100)]
lavfi/hue: reindent after previous commit
Stefano Sabatini [Tue, 19 Feb 2013 22:38:41 +0000 (23:38 +0100)]
lavfi/hue: simplify parsing by making use of option shorthands
Michael Niedermayer [Wed, 20 Feb 2013 10:14:08 +0000 (11:14 +0100)]
Merge commit '
2ed008204d5467be03a0a3af1e293b2f7038d0a0'
* commit '
2ed008204d5467be03a0a3af1e293b2f7038d0a0':
h264: Add add_pixels4/8() to h264dsp, and remove add_pixels4 from dsputil
Conflicts:
libavcodec/dsputil.c
libavcodec/h264.c
libavcodec/h264_mb_template.c
libavcodec/h264addpx_template.c
libavcodec/h264dsp.c
libavcodec/h264dsp.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 20 Feb 2013 09:57:31 +0000 (10:57 +0100)]
Merge commit '
e5ffffe48d20642acc079166f0fa7d93a6a9f594'
* commit '
e5ffffe48d20642acc079166f0fa7d93a6a9f594':
h264chroma: Remove duplicate 9/10 bit functions
x86: Use simple nop codes for <= sse (rather than <= mmx)
vp56: Remove clear_blocks call, and clear alpha plane U/V DC only
Merged-by: Michael Niedermayer <michaelni@gmx.at>
u-bo1b@0w.se [Mon, 18 Feb 2013 19:47:45 +0000 (20:47 +0100)]
cinepak: More correct Cinepak decoder.
change the treatment of the strip y coordinates which previously did
not follow the description (nor did it behave like the binary decoder
on files with absolute strip offsets).
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 20 Feb 2013 01:40:50 +0000 (02:40 +0100)]
cinepak: simplify
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
u-bo1b@0w.se [Mon, 18 Feb 2013 17:00:33 +0000 (18:00 +0100)]
cinepak: Use correct colorspace.
The new code is also faster and more robust.
As for the performance:
old decoder + conversion to rgb: fps = 2618
old decoder, without converting to rgb: fps = 4012
new decoder, producing rgb: fps = 4502
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 20 Feb 2013 01:24:30 +0000 (02:24 +0100)]
avcodec_align_dimensions2: Ensure cinepak has large enough buffers.
This is partly redundant with the following patches, but its safer
Found-by: u-bo1b@0w.se
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Tue, 19 Feb 2013 17:04:49 +0000 (09:04 -0800)]
h264: add videodsp dependency.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Tue, 19 Feb 2013 23:25:26 +0000 (00:25 +0100)]
intreadwrite: tomi: Add missing attributes.h #include for av_always_inline
Diego Biurrun [Tue, 19 Feb 2013 23:15:15 +0000 (00:15 +0100)]
build: Ensure that output directories for header objects are created
Michael Niedermayer [Tue, 19 Feb 2013 23:19:39 +0000 (00:19 +0100)]
cook: check js_subband_start for validity
Fixes out of array read
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Tue, 19 Feb 2013 22:07:35 +0000 (00:07 +0200)]
h264: Get rid of unnecessary casts
This gets rid of a number of warnings about casts discarding
qualifiers from the pointer target, present since
7ebfb466a.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Tue, 19 Feb 2013 22:06:40 +0000 (23:06 +0100)]
shorten: Fix signedness of comparission
Fixes out of array accessed
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 19 Feb 2013 20:40:09 +0000 (21:40 +0100)]
vc1dec: dont decode slices when the slice header failed to decode.
Fixes assertion failure
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Mon, 18 Feb 2013 01:01:26 +0000 (17:01 -0800)]
h264/svq3: Stop using draw_edges
Instead, only extend edges on-demand when the motion vector actually
crosses the visible decoded area using ff_emulated_edge_mc(). This
changes decoding time for cathedral from 8.722sec to 8.706sec, i.e.
0.2% faster overall. More generally (VP8 uses this also), low-motion
content gets significant speed improvements, whereas high-motion content
tends to decode in approximately the same time.
Signed-off-by: Martin Storsjö <martin@martin.st>
Ronald S. Bultje [Sun, 17 Feb 2013 22:52:24 +0000 (14:52 -0800)]
h264: Don't store intra pcm samples in h->mb
Instead, keep them in the bitstream buffer until we read them verbatim,
this saves a memcpy() and a subsequent clearing of the target buffer.
decode_cabac+decode_mb for a sample file (CAPM3_Sony_D.jsv) goes from
6121.4 to 6095.5 cycles, i.e. 26 cycles faster.
Signed-off-by: Martin Storsjö <martin@martin.st>
Ronald S. Bultje [Mon, 11 Feb 2013 00:46:07 +0000 (16:46 -0800)]
get_bits: Return pointer to buffer that is the result of the alignment
This allows more transparent mixing of get_bits and whole-byte access
without having to touch get_bits internals.
Signed-off-by: Martin Storsjö <martin@martin.st>
Ronald S. Bultje [Tue, 12 Feb 2013 01:04:27 +0000 (17:04 -0800)]
h264: Add add_pixels4/8() to h264dsp, and remove add_pixels4 from dsputil
These functions are mostly H264-specific (the only other user I can
spot is bink), and this allows us to special-case some functionality
for H264. Also remove the 16-bit-coeff with >8bpp versions (unused)
and merge the duplicate 32-bit-coeff for >8bpp (identical).
Signed-off-by: Martin Storsjö <martin@martin.st>
Ronald S. Bultje [Mon, 11 Feb 2013 21:52:38 +0000 (13:52 -0800)]
h264chroma: Remove duplicate 9/10 bit functions
These functions do the same thing in 16 bit space and don't need
any depth specific clipping.
Signed-off-by: Martin Storsjö <martin@martin.st>
Ronald S. Bultje [Tue, 29 Jan 2013 23:55:19 +0000 (15:55 -0800)]
x86: Use simple nop codes for <= sse (rather than <= mmx)
The "CentaurHauls family 6 model 9 stepping 8" family of CPUs
(flags: fpu vme de pse tsc msr cx8 sep mtrr pge mov pat mmx fxsr sse
up rng rng_en ace ace_en) SIGILLs on long nop codes.
Signed-off-by: Martin Storsjö <martin@martin.st>
Ronald S. Bultje [Fri, 1 Feb 2013 19:04:50 +0000 (11:04 -0800)]
vp56: Remove clear_blocks call, and clear alpha plane U/V DC only
The non-alpha and alpha-Y planes are cleared in the idct_put/add()
calls. For the alpha U/V planes, we only care about the DC for entropy
context prediction purposes, the rest of the data is unused.
Signed-off-by: Martin Storsjö <martin@martin.st>
Paul B Mahol [Tue, 19 Feb 2013 16:10:52 +0000 (16:10 +0000)]
configure: fix libavfilter pkgconfig description
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Tue, 19 Feb 2013 16:48:56 +0000 (17:48 +0100)]
tiff: check bppcount
Fixes division by 0
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 19 Feb 2013 15:59:26 +0000 (16:59 +0100)]
bmp: check available space when reading palette
Fixes out of array read
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Tue, 19 Feb 2013 05:03:02 +0000 (21:03 -0800)]
h264: integrate clear_blocks calls with IDCT.
The non-intra-pcm branch in hl_decode_mb (simple, 8bpp) goes from 700
to 672 cycles, and the complete loop of decode_mb_cabac and hl_decode_mb
(in the decode_slice loop) goes from 1759 to 1733 cycles on the clip
tested (cathedral), i.e. almost 30 cycles per mb faster.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Tue, 19 Feb 2013 05:03:01 +0000 (21:03 -0800)]
svq3: fix decoding residual blocks of b-frames.
The residual block data of 16x16 blocks was ignored for b-frames, which
leads to easy-to-identify artifacts. After this patch, the artifacts are
gone. Sample video: svq3_watermark.mov. (Fate results unaffected.)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 19 Feb 2013 14:00:01 +0000 (15:00 +0100)]
avfilter/ff_merge_formats: only merge if doing so does not loose chroma or alpha
Fixes Ticket1280
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 19 Feb 2013 11:51:00 +0000 (12:51 +0100)]
x86/h263_loopfilter: Fix author attribution after code has been moved/splited around
Reference:
commit
3615e2be846f6382aa42360d02d16b25f443af9f
Author: Michael Niedermayer <michaelni@gmx.at>
Date: Tue Dec 2 22:02:57 2003 +0000
h263_h_loop_filter_mmx
Originally committed as revision 2553 to svn://svn.ffmpeg.org/ffmpeg/trunk
commit
359f98ded95ec65f7109b25f3cfaa9189c4fab9c
Author: Michael Niedermayer <michaelni@gmx.at>
Date: Tue Dec 2 20:28:10 2003 +0000
h263_v_loop_filter_mmx
Originally committed as revision 2552 to svn://svn.ffmpeg.org/ffmpeg/trunk
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 19 Feb 2013 11:41:27 +0000 (12:41 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: dsputil: Fix h263 loop filter link error in some configurations
Conflicts:
libavcodec/x86/dsputil.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 19 Feb 2013 11:32:04 +0000 (12:32 +0100)]
Merge commit '
7a03145ed7cb4f1ce794b5126559dd6f38029243'
* commit '
7a03145ed7cb4f1ce794b5126559dd6f38029243':
x86: dsputil: int --> ptrdiff_t for ff_put_pixels16_mmxext line_size param
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 19 Feb 2013 11:12:17 +0000 (12:12 +0100)]
Merge commit '
202b5f6deb65e405b07b9b5c20f97c8cb925cf49'
* commit '
202b5f6deb65e405b07b9b5c20f97c8cb925cf49':
doc: Fix some obsolete references to av* tools as ff* tools
Conflicts:
doc/demuxers.texi
No code changes, merge for metadata only
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Mon, 18 Feb 2013 17:03:58 +0000 (17:03 +0000)]
tmv: initialize unused pallete entries with 0
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 11 Feb 2013 17:15:07 +0000 (17:15 +0000)]
lavfi/overlay: yuv444p & yuva444p support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Tue, 19 Feb 2013 01:47:47 +0000 (02:47 +0100)]
h264: put visualization and debug support back
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 19 Feb 2013 01:46:05 +0000 (02:46 +0100)]
mpegvideo: make ff_print_debug_info independant of mpegvideo
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Mon, 18 Feb 2013 16:15:52 +0000 (08:15 -0800)]
split out ff_hwaccel_pixfmt_list_420[] over individual codecs.
Not all hwaccels implement all codecs, so using one single list for
multiple such codecs means some codecs will be represented in the list,
even though they don't actually handle that codec. Copying specific
lists in each codec fixes that.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Mon, 18 Feb 2013 20:12:07 +0000 (20:12 +0000)]
lavfi/histogram: overlay display mode for levels histogram mode
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Mon, 18 Feb 2013 19:51:54 +0000 (20:51 +0100)]
nutenc: only write an index if there are syncpoints
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 18 Feb 2013 19:18:19 +0000 (20:18 +0100)]
ff_gen_search: Fix finding the maximum timestamp in a really small file
Fixes Assertion failure
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 18 Feb 2013 18:48:44 +0000 (19:48 +0100)]
ff_read_timestamp: check stream_index before using it as array index
Fixes out of array read
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Mon, 18 Feb 2013 16:37:32 +0000 (16:37 +0000)]
cdgraphics: set palette to zero too
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 18 Feb 2013 16:19:27 +0000 (16:19 +0000)]
lavc/cdxl: clear palette before reading it
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Daniel Kang [Mon, 18 Feb 2013 15:50:06 +0000 (10:50 -0500)]
x86: dsputil: Fix h263 loop filter link error in some configurations
This was caused by unconditionally referencing a conditionally compiled
table. Now the code is also compiled conditionally.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Daniel Kang [Fri, 15 Feb 2013 20:13:58 +0000 (15:13 -0500)]
x86: dsputil: int --> ptrdiff_t for ff_put_pixels16_mmxext line_size param
This avoids SIMD-optimized functions having to sign-extend their
line size argument manually to be able to do pointer arithmetic.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Ronald S. Bultje [Mon, 18 Feb 2013 02:20:17 +0000 (18:20 -0800)]
x86/dsputil: fix compilation when h263 decoder/encoder are disabled.
The symbol "ff_h263_loop_filter_strength" is defined in h263.c, but
the h263 loopfilter functions (in the .asm file) are not optimized
out (even though their function pointers are never assigned).
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Mon, 18 Feb 2013 01:01:26 +0000 (17:01 -0800)]
h264/svq3: stop using draw_edges.
Instead, only extend edges on-demand when the motion vector actually
crosses the visible decoded area using ff_emulated_edge_mc(). This
changes decoding time for cathedral from 8.722sec to 8.706sec, i.e.
0.2% faster overall. More generally (VP8 uses this also), low-motion
content gets significant speed improvements, whereas high-motion content
tends to decode in approximately the same time.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Mon, 18 Feb 2013 12:34:37 +0000 (13:34 +0100)]
lavf/showspectrum: add divVerent in the (c) for his recent work on the filter.
Vicente Jimenez Aguilar [Sat, 16 Feb 2013 02:08:36 +0000 (03:08 +0100)]
doc: Fix some obsolete references to av* tools as ff* tools
Signed-off-by: Diego Biurrun <diego@biurrun.de>
CC: libav-stable@libav.org
Michael Niedermayer [Mon, 18 Feb 2013 12:00:46 +0000 (13:00 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
svq3: unbreak decoding
No change to the code as this fix was already part of FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 18 Feb 2013 11:55:31 +0000 (12:55 +0100)]
Merge commit '
aa11cb79318baa3415d553424ba378f6c62e1f9b'
* commit '
aa11cb79318baa3415d553424ba378f6c62e1f9b':
build: make audio_frame_queue a stand-alone component
Conflicts:
configure
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 18 Feb 2013 11:29:31 +0000 (12:29 +0100)]
Merge commit '
870a0c669e536d56c6325d84f65e34c53792398e'
* commit '
870a0c669e536d56c6325d84f65e34c53792398e':
build: The libopencore-amrnb encoder depends on audio_frame_queue
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 18 Feb 2013 11:20:12 +0000 (12:20 +0100)]
Merge commit '
8837f4396a1a458a0efb07fe7daba7b847755a7a'
* commit '
8837f4396a1a458a0efb07fe7daba7b847755a7a':
libopencore-amrwb: Make AMR-WB ifdeffery more precise
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 18 Feb 2013 11:15:07 +0000 (12:15 +0100)]
Merge commit '
e6bda9a9fd86505927a2e095e495eae104860701'
* commit '
e6bda9a9fd86505927a2e095e495eae104860701':
libopencore-amr: Conditionally compile decoder and encoder bits
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 18 Feb 2013 11:10:46 +0000 (12:10 +0100)]
Merge commit '
56632fef65c0cb6946ed3648ded3d7b82e5c5c17'
* commit '
56632fef65c0cb6946ed3648ded3d7b82e5c5c17':
libopencore-amrnb: cosmetics: Group all encoder-related code together
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 18 Feb 2013 10:32:07 +0000 (11:32 +0100)]
Merge commit '
0b70fb1d518cbd796545fd6eef02772cd0d892c7'
* commit '
0b70fb1d518cbd796545fd6eef02772cd0d892c7':
dsputil: convert remaining op_pixels_func
No changes to the code as all these fixes already existed in FFmpeg.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 18 Feb 2013 10:26:53 +0000 (11:26 +0100)]
Merge commit '
488f87be873506abb01d67708a67c10a4dd29283'
* commit '
488f87be873506abb01d67708a67c10a4dd29283':
roqvideodec: check dimensions validity
vqavideo: check chunk sizes before reading chunks
qdm2: check array index before use, fix out of array accesses
Conflicts:
libavcodec/qdm2.c
libavcodec/roqvideodec.c
libavcodec/vqavideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Matti Hamalainen [Mon, 18 Feb 2013 01:55:07 +0000 (02:55 +0100)]
svq3: unbreak decoding
a7d2861d36756b913e85681b86ed3385274e8ced removed necessary braces.
Ronald S. Bultje [Sun, 17 Feb 2013 22:52:24 +0000 (14:52 -0800)]
h264: don't store intra pcm samples in h->mb.
Instead, keep them in the bitstream buffer until we read them verbatim,
this saves a memcpy() and a subsequent clearing of the target buffer.
decode_cabac+decode_mb for a sample file (CAPM3_Sony_D.jsv) goes from
6121.4 to 6095.5 cycles, i.e. 26 cycles faster.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 17 Feb 2013 23:46:03 +0000 (00:46 +0100)]
v4l2: try to fix build on BSD
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sun, 17 Feb 2013 21:05:33 +0000 (21:05 +0000)]
lavfi/noise: switch to AVLFG noise generator
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Carl Eugen Hoyos [Sun, 17 Feb 2013 21:33:40 +0000 (22:33 +0100)]
h264: don't initialize missing pictures when using VDPAU.
This fixes an assertion failure when running mplayer -vc ffh264vdpau.
Reported by irc user ioni.
Michael Niedermayer [Sun, 17 Feb 2013 19:41:16 +0000 (20:41 +0100)]
h264: avoid calling get_format() multiple times
Some applications do not like that.
Fixes VDA
Reduces noise for VDPAU
Tested-by: Guillaume POIRIER <poirierg@gmail.com>
Tested-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Sun, 17 Feb 2013 21:00:36 +0000 (22:00 +0100)]
build: make audio_frame_queue a stand-alone component
Encoders requiring it have the dependency expressed in the
configure.
Carl Eugen Hoyos [Sun, 17 Feb 2013 18:56:09 +0000 (19:56 +0100)]
Revert "swfenc: use av_get_audio_frame_duration() instead of AVCodecContext.frame_size"
This reverts commit
620b88a302d522f71a6a95aff500cf7bd8520043.
Fixes ticket #2272.
Conflicts:
libavformat/swfenc.c
Carl Eugen Hoyos [Sun, 17 Feb 2013 18:45:58 +0000 (19:45 +0100)]
Add yvu410 as a supported v4l2 input format.
Carl Eugen Hoyos [Sun, 17 Feb 2013 18:44:13 +0000 (19:44 +0100)]
Add gray16 as a supported v4l2 input format.
Michael Niedermayer [Sun, 17 Feb 2013 16:16:30 +0000 (17:16 +0100)]
fate: add print() to the tests of eval
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 25 Jan 2013 16:51:56 +0000 (17:51 +0100)]
eval: print() support
This allows printing values via av_log from expressions.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sun, 17 Feb 2013 16:29:55 +0000 (17:29 +0100)]
Only set accelerated arm fft functions if fft is enabled.
Fixes lavc compilation (linking) for configurations without fft.
Reported-by: tyler wear
Tested-by: Gavin Kinsey
Clément Bœsch [Sun, 17 Feb 2013 15:58:08 +0000 (16:58 +0100)]
doc/codecs: simple sub_charenc option documentation.
Nicolas George [Sat, 16 Feb 2013 10:36:32 +0000 (11:36 +0100)]
doc/examples: do not allocate AVFrame directly.
The size of the AVFrame structure is not part of the ABI;
it can grow with later versions. Therefore, applications
are not supposed to allocate AVFrame directly, they are
supposed to use avcodec_alloc_frame() instead.
Michael Niedermayer [Sun, 17 Feb 2013 13:24:01 +0000 (14:24 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
error_resilience: add required headers.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sun, 17 Feb 2013 12:33:52 +0000 (13:33 +0100)]
lavf/subtitles: error out in case of bitmap subtitles.
Clément Bœsch [Sun, 17 Feb 2013 12:28:20 +0000 (13:28 +0100)]
lavc: fix codec_descriptor and pkt_timebase doxy.
Stefano Sabatini [Sun, 17 Feb 2013 12:11:33 +0000 (13:11 +0100)]
tests: fix values for the unsharp test
Set odd size for unsharp matrices, even values are not accepted.
Clément Bœsch [Sun, 17 Feb 2013 12:08:30 +0000 (13:08 +0100)]
lavc/utils: reindent in avcodec_decode_subtitle2() after
f7963993.
Clément Bœsch [Sun, 17 Feb 2013 11:33:55 +0000 (12:33 +0100)]
lavfi/subtitles: set a different description between ass and subtitles.
Clément Bœsch [Mon, 31 Dec 2012 10:18:29 +0000 (11:18 +0100)]
lavfi: rename vf_ass.c to vf_subtitles.c