]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Sun, 10 Feb 2013 13:17:06 +0000 (14:17 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
sws: disable yuv2rgb warning for planar rgb.
Conflicts:
libswscale/yuv2rgb.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Feb 2013 13:07:27 +0000 (14:07 +0100)]
Merge commit '
7b41c24c5fa221b55a9302efaf1a9eeb38b12551 '
* commit '
7b41c24c5fa221b55a9302efaf1a9eeb38b12551 ':
sws: dont enable chrSrcHSubSample for planar RGB
Conflicts:
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sun, 10 Feb 2013 00:21:12 +0000 (01:21 +0100)]
lavfi/il: move query_formats() definition up
Respect order of call during the filter lifecycle, improve readability.
Stefano Sabatini [Sun, 10 Feb 2013 00:15:47 +0000 (01:15 +0100)]
lavfi/il: simplify/generalize linesize computation
Rely on generic utilities for computing each plane linesize.
In particular, add support to NV12/21 formats and avoid use of
PIX_FMT_PLANAR pixdesc flag, whose semantics is questionable.
It also fixes various crashes.
Michael Niedermayer [Sun, 10 Feb 2013 12:55:51 +0000 (13:55 +0100)]
Merge commit '
e58013dd8f00e17dd98ba64e41c72f1d152f6608 '
* commit '
e58013dd8f00e17dd98ba64e41c72f1d152f6608 ':
sws: use planarRgbToRgbWrapper only for 8bit per component
Conflicts:
libswscale/swscale_unscaled.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Feb 2013 12:48:21 +0000 (13:48 +0100)]
Merge commit '
d6d5ef5534d582f9dbaf18ac2605cf5bb72cd821 '
* commit '
d6d5ef5534d582f9dbaf18ac2605cf5bb72cd821 ':
sws: GBRP9, GBRP10, and GBRP16 output support
Conflicts:
libswscale/output.c
libswscale/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 [Sun, 10 Feb 2013 12:17:58 +0000 (13:17 +0100)]
Merge commit '
81726a4f0b8a43e19898e2a36fdde80583bafff0 '
* commit '
81726a4f0b8a43e19898e2a36fdde80583bafff0 ':
FATE: add tests for additional flavors of asf cover art
asfdec: do not assume every AVStream has a corresponding ASFStream
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Feb 2013 12:06:16 +0000 (13:06 +0100)]
Merge commit '
f5fac6f77752931347ab302563802dcaa49c2419 '
* commit '
f5fac6f77752931347ab302563802dcaa49c2419 ':
asfdec: support reading ID3v2 tags in ASF files
Conflicts:
Changelog
libavformat/asfdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Feb 2013 11:47:02 +0000 (12:47 +0100)]
Merge commit '
db0a943266be29ff0596872ebb418dfed75d00de '
* commit '
db0a943266be29ff0596872ebb418dfed75d00de ':
avplay: apply the stream sample_aspect_ratio to decoded video frames
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Feb 2013 11:39:12 +0000 (12:39 +0100)]
Merge commit '
84b721db366c0734fdfd23c8daaa7da7da21f761 '
* commit '
84b721db366c0734fdfd23c8daaa7da7da21f761 ':
asfdec: also read Metadata Library Object
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Feb 2013 11:18:50 +0000 (12:18 +0100)]
Merge commit '
61f9ad2dfcb3f98b7ac5777d19d0e7b61d0be01e '
* commit '
61f9ad2dfcb3f98b7ac5777d19d0e7b61d0be01e ':
asfdec: read the full Metadata Object, not just aspect ratio information
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Feb 2013 11:14:08 +0000 (12:14 +0100)]
Merge commit '
36fab50e90d15352e403e4cc210890810f2fb4e2 '
* commit '
36fab50e90d15352e403e4cc210890810f2fb4e2 ':
asfdec: silence a warning
mss4, ra288: Remove unused DSPContext local codec context members
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sun, 10 Feb 2013 09:51:12 +0000 (10:51 +0100)]
Do not write invalid matroska files.
Some real codecs are supported by the matroska specification
(and FFmpeg's matroska demuxer) but not the FFmpeg muxer.
Michael Niedermayer [Sun, 10 Feb 2013 00:19:25 +0000 (01:19 +0100)]
imgconvert: use get_pix_fmt_score in avcodec_find_best_pix_fmt_of_2()
This fixes various poorly choosen pixel format cases.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Feb 2013 00:04:57 +0000 (01:04 +0100)]
imgconvert: add get_pix_fmt_score()
get_pix_fmt_score() returns a score representing the amount
of loss when converting a pixel format
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sat, 9 Feb 2013 21:56:04 +0000 (21:56 +0000)]
lavfi/il: fix typo in Copyright
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sat, 9 Feb 2013 21:01:54 +0000 (21:01 +0000)]
lavfi: remove mp=il filter
Native il video filter is now available.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 8 Feb 2013 15:48:59 +0000 (15:48 +0000)]
lavfi: port MP il filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sat, 9 Feb 2013 19:49:32 +0000 (20:49 +0100)]
targa: Fix y check in advance_line
Fixes out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Sat, 9 Feb 2013 19:50:11 +0000 (20:50 +0100)]
lavf: add tee pseudo-muxer.
Michael Niedermayer [Sat, 26 Jan 2013 22:05:26 +0000 (23:05 +0100)]
sws: disable yuv2rgb warning for planar rgb.
planar rgb formats do not use the table
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Paul B Mahol [Sat, 9 Feb 2013 19:31:17 +0000 (19:31 +0000)]
rv10: remove check that is always true
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sat, 26 Jan 2013 18:49:22 +0000 (19:49 +0100)]
sws: dont enable chrSrcHSubSample for planar RGB
This code path is not implemented and makes not much sense to implement
either.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Michael Niedermayer [Sat, 26 Jan 2013 18:43:06 +0000 (19:43 +0100)]
sws: use planarRgbToRgbWrapper only for 8bit per component
The function doesnt support >8bit currently
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Michael Niedermayer [Fri, 25 Jan 2013 22:05:48 +0000 (23:05 +0100)]
sws: GBRP9, GBRP10, and GBRP16 output support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Anton Khirnov [Fri, 8 Feb 2013 13:00:28 +0000 (14:00 +0100)]
FATE: add tests for additional flavors of asf cover art
Vladimir Pantelic [Fri, 8 Feb 2013 10:06:37 +0000 (11:06 +0100)]
asfdec: support reading ID3v2 tags in ASF files
Yes, these files do exist
Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Vladimir Pantelic [Thu, 7 Feb 2013 17:42:39 +0000 (18:42 +0100)]
avplay: apply the stream sample_aspect_ratio to decoded video frames
If there is a sample_aspect_ratio in the stream, then apply it to every
decoded frame in the same way as avconv does. This also makes sure that
the avfilter chain has access to the aspect ratio.
Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Vladimir Pantelic [Wed, 6 Feb 2013 13:35:27 +0000 (14:35 +0100)]
asfdec: also read Metadata Library Object
In some ASF files this objects holds cover art and other tags. Compared to
Metadata Object it can also hold GUIDs, but we ignore these for now.
Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Vladimir Pantelic [Wed, 6 Feb 2013 13:35:26 +0000 (14:35 +0100)]
asfdec: read the full Metadata Object, not just aspect ratio information
Use the same get_tag()/get_value() as for the Extended Content Description
but handle the 16 bit vs 32 bit difference for type 2 (BOOL)
Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Vladimir Pantelic [Wed, 6 Feb 2013 13:35:25 +0000 (14:35 +0100)]
asfdec: silence a warning
Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Fri, 8 Feb 2013 12:54:36 +0000 (13:54 +0100)]
asfdec: do not assume every AVStream has a corresponding ASFStream
This won't be true for ID3 attached picture.
Also stop allocating now useless dummy ASFStreams for ASF native
attached pictures.
Michael Niedermayer [Sat, 9 Feb 2013 17:40:12 +0000 (18:40 +0100)]
motionpixels: Check that the vlc table has been fully inited
Fixes out of array reads
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 9 Feb 2013 17:37:53 +0000 (18:37 +0100)]
motionpixels: Propagate errors in vlc table init
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Carl Eugen Hoyos [Sat, 9 Feb 2013 17:14:46 +0000 (18:14 +0100)]
Call the common 7.1 wide channel layout "7.1(wide)".
Rename the uncommon variant with side speakers to "7.1(wide-side)".
Paul B Mahol [Sat, 9 Feb 2013 14:02:13 +0000 (14:02 +0000)]
lavu/internal: rename macro E(x) to EXPAND(x)
Fixes bunch of warnings of E redefinition under clang.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sat, 9 Feb 2013 16:05:28 +0000 (16:05 +0000)]
lavfi/histogram: make waveform mode more useful
Now it displays all color components (not just luma)
either in parade or overlay and also works with RGB colorspace.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sat, 9 Feb 2013 14:16:53 +0000 (14:16 +0000)]
paf, sanm: remove unused header after
b05830169d
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Carl Eugen Hoyos [Sat, 9 Feb 2013 14:01:51 +0000 (15:01 +0100)]
Fix libpostproc compilation on x86_32 with disable-optimizations.
Stefano Sabatini [Sat, 9 Feb 2013 13:49:47 +0000 (14:49 +0100)]
doc/filters: end table in histogram docs
Stefano Sabatini [Fri, 8 Feb 2013 23:58:35 +0000 (00:58 +0100)]
doc/demuxers: add docs for rawvideo demuxer
Stefano Sabatini [Fri, 8 Feb 2013 23:58:19 +0000 (00:58 +0100)]
lavf/rawvideodec: fix/extend option descriptions
Stefano Sabatini [Fri, 8 Feb 2013 23:45:51 +0000 (00:45 +0100)]
doc/demuxers: fix copy&paste error in "@c man end" line
Use proper name for ending chapter.
Stefano Sabatini [Fri, 8 Feb 2013 23:45:05 +0000 (00:45 +0100)]
doc/demuxers: sort demuxers by name
Michael Niedermayer [Sat, 9 Feb 2013 13:42:06 +0000 (14:42 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dsputil: Move fdct function declarations to dct.h
Conflicts:
libavcodec/dsputil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 9 Feb 2013 13:33:57 +0000 (14:33 +0100)]
Merge commit '
218aefce4472dc02ee3f12830a9a894bf7916da9 '
* commit '
218aefce4472dc02ee3f12830a9a894bf7916da9 ':
dsputil: Move LOCAL_ALIGNED macros to libavutil
Conflicts:
libavcodec/dvdec.c
libavcodec/imc.c
libavcodec/mpegvideo_motion.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Fri, 8 Feb 2013 23:09:54 +0000 (00:09 +0100)]
mss4, ra288: Remove unused DSPContext local codec context members
Michael Niedermayer [Sat, 9 Feb 2013 13:27:39 +0000 (14:27 +0100)]
Merge commit '
059866eb17cd3c66422a61d3e9c3305f55830a50 '
* commit '
059866eb17cd3c66422a61d3e9c3305f55830a50 ':
dsputil: Move WRAPPER8_16_SQ macro to the only place it is used
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 9 Feb 2013 13:18:14 +0000 (14:18 +0100)]
rnd_avg: fix author attribution
Reference:
commit
41fda91d097b85542981a4779e36f8eefda7ee69
Author: BERO <bero@geocities.co.jp>
Date: Wed May 14 17:46:55 2003 +0000
aligned dsputil (for sh4) patch by (BERO <bero at geocities dot co dot jp>)
Originally committed as revision 1880 to svn://svn.ffmpeg.org/ffmpeg/trunk
commit
8dbe5856410ee10ac4a9368105149efdacfac994
Author: Oskar Arvidsson <oskar@irock.se>
Date: Tue Mar 29 17:48:59 2011 +0200
Adds 8-, 9- and 10-bit versions of some of the functions used by the h264 decoder.
This patch lets e.g. dsputil_init chose dsp functions with respect to
the bit depth to decode. The naming scheme of bit depth dependent
functions is <base name>_<bit depth>[_<prefix>] (i.e. the old
clear_blocks_c is now named clear_blocks_8_c).
Note: Some of the functions for high bit depth is not dependent on the
bit depth, but only on the pixel size. This leaves some room for
optimizing binary size.
Preparatory patch for high bit depth h264 decoding support.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 9 Feb 2013 13:01:40 +0000 (14:01 +0100)]
Merge commit '
bf6b3ec924b4fb64d14df33077f4d4541d525dbf '
* commit '
bf6b3ec924b4fb64d14df33077f4d4541d525dbf ':
dsputil: Move rnd_avg inline functions to a separate header
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 9 Feb 2013 12:51:43 +0000 (13:51 +0100)]
Merge commit '
b9c2408b19dc9408e9dc0ce4a099af529bbfba3b '
* commit '
b9c2408b19dc9408e9dc0ce4a099af529bbfba3b ':
dsputil: Remove commented-out, unused function declarations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 9 Feb 2013 12:44:55 +0000 (13:44 +0100)]
Merge commit '
35685a3c2a1ec09f3c62dcfc4368fe9e92bcddf6 '
* commit '
35685a3c2a1ec09f3c62dcfc4368fe9e92bcddf6 ':
dsputil: Move ff_shrink* function declarations to separate header
dsputil: Move ff_svq3 function declarations to a separate header
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 9 Feb 2013 12:40:03 +0000 (13:40 +0100)]
Merge commit '
6a4430407404bfe55581e66a86a496c9adf6fb44 '
* commit '
6a4430407404bfe55581e66a86a496c9adf6fb44 ':
dsputil: Move ff_h264_idct function declarations to a separate header
Conflicts:
libavcodec/dsputil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sat, 9 Feb 2013 12:25:55 +0000 (12:25 +0000)]
lavfi/histogram: make it C90 compliant
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sat, 9 Feb 2013 12:16:57 +0000 (13:16 +0100)]
Merge commit '
b9ba5253dd1232be4b48cfe61c31ff4b3de3d10a '
* commit '
b9ba5253dd1232be4b48cfe61c31ff4b3de3d10a ':
dsputil: Move copy_block functions to a separate header
dsputil: Drop unused functions copy_block{2|4|16}
No functions are droped because they are used in several places.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 21 Dec 2012 18:50:13 +0000 (18:50 +0000)]
histogram filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sat, 9 Feb 2013 11:19:21 +0000 (12:19 +0100)]
Merge commit '
b9ee5f2cab3ffe1c962e542346b1ed61394864ec '
* commit '
b9ee5f2cab3ffe1c962e542346b1ed61394864ec ':
indeo3: replace use of copy_block4 with put_pixels
mjpegdec: use put_pixels instead of copy_block8
Conflicts:
libavcodec/mjpegdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 9 Feb 2013 11:05:53 +0000 (12:05 +0100)]
Merge commit '
b5b7b75e91e291c810ebd01868a42b53f267a87c '
* commit '
b5b7b75e91e291c810ebd01868a42b53f267a87c ':
dsputil: Move get_penalty_factor() to the only place it is used.
Conflicts:
libavcodec/dsputil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 9 Feb 2013 10:43:23 +0000 (11:43 +0100)]
Merge commit '
0b016eb99d38738e2c53e36549a4732a0f863b2e '
* commit '
0b016eb99d38738e2c53e36549a4732a0f863b2e ':
dsputil: Move ff_block_permute to mpegvideo_enc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 9 Feb 2013 03:06:52 +0000 (04:06 +0100)]
Merge remote-tracking branch 'rdp/dshow_shared'
* rdp/dshow_shared:
dshow: attempt to build shared as well as static
Merged-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sat, 9 Feb 2013 00:59:45 +0000 (21:59 -0300)]
sparc: Revert some parameter name changes in dsputil_vis.c
They were renamed by mistake in
25841df .
This should fix compilation failures on sparc.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 Feb 2013 23:43:30 +0000 (00:43 +0100)]
get_se_golomb: fix decoding of very large values
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Thu, 7 Feb 2013 20:58:48 +0000 (21:58 +0100)]
dsputil: Move fdct function declarations to dct.h
Diego Biurrun [Thu, 7 Feb 2013 23:31:13 +0000 (00:31 +0100)]
dsputil: Move LOCAL_ALIGNED macros to libavutil
Diego Biurrun [Thu, 7 Feb 2013 21:39:26 +0000 (22:39 +0100)]
dsputil: Move WRAPPER8_16_SQ macro to the only place it is used
Diego Biurrun [Thu, 7 Feb 2013 21:37:00 +0000 (22:37 +0100)]
dsputil: Move rnd_avg inline functions to a separate header
Diego Biurrun [Thu, 7 Feb 2013 21:18:07 +0000 (22:18 +0100)]
dsputil: Remove commented-out, unused function declarations
Michael Niedermayer [Fri, 8 Feb 2013 21:55:55 +0000 (22:55 +0100)]
dsp: make put_no_rnd_pixels_tab 4x4 big
This makes it match the other tables and fixes out of array acceses.
Fixes CID980012
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Fri, 8 Feb 2013 04:17:06 +0000 (01:17 -0300)]
dxva2: Prevent redefinition of _WIN32_WINNT
Don't redefine _WIN32_WINNT when targeting Win7/8
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 8 Feb 2013 11:51:52 +0000 (12:51 +0100)]
ff_end_tag: assert that the start is aligned.
If its start is not aligned then aligning its end will
likely break many demuxers as they check the size and not
the position.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Thu, 7 Feb 2013 10:00:40 +0000 (10:00 +0000)]
riff: chunks must be at 2 byte boundary
Fixes #2244.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Fri, 1 Feb 2013 18:58:26 +0000 (19:58 +0100)]
vc1dec: Fix destination pointers in context for fields
This replaces a large number of checks for the second field by
fixing the pointers when they are setup
This should also fix I/BI field pictures
Changes checksums for vc1_sa10143, the file becomes slightly closer
to what the reference decoder outputs
Based on "vc1dec: the second field is written wrong to the picture"
by Sebastian Sandberg <sebastiand.sandberg@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Thu, 7 Feb 2013 20:43:58 +0000 (21:43 +0100)]
dsputil: Move ff_shrink* function declarations to separate header
Diego Biurrun [Thu, 7 Feb 2013 20:25:55 +0000 (21:25 +0100)]
dsputil: Move ff_h264_idct function declarations to a separate header
Diego Biurrun [Thu, 7 Feb 2013 21:03:49 +0000 (22:03 +0100)]
dsputil: Move copy_block functions to a separate header
Mans Rullgard [Sun, 9 Dec 2012 19:18:47 +0000 (19:18 +0000)]
indeo3: replace use of copy_block4 with put_pixels
The destination is sufficiently aligned for put_pixels here.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diego Biurrun [Thu, 7 Feb 2013 20:33:31 +0000 (21:33 +0100)]
dsputil: Move ff_svq3 function declarations to a separate header
Diego Biurrun [Thu, 7 Feb 2013 20:12:49 +0000 (21:12 +0100)]
dsputil: Drop unused functions copy_block{2|4|16}
Mans Rullgard [Mon, 10 Dec 2012 09:57:10 +0000 (09:57 +0000)]
mjpegdec: use put_pixels instead of copy_block8
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diego Biurrun [Thu, 7 Feb 2013 20:07:57 +0000 (21:07 +0100)]
dsputil: Move get_penalty_factor() to the only place it is used.
Diego Biurrun [Thu, 7 Feb 2013 20:04:32 +0000 (21:04 +0100)]
dsputil: Move ff_block_permute to mpegvideo_enc
Michael Niedermayer [Sun, 5 Aug 2012 23:25:57 +0000 (01:25 +0200)]
lavf: add seek2any to allow forcing seeking to non keyframes via AVOptions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Feb 2013 20:34:35 +0000 (21:34 +0100)]
matroskadec: support seek to non keyframes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Thu, 7 Feb 2013 20:16:11 +0000 (21:16 +0100)]
lavfi/select: correctly set prev_t and prev_pts
In particular, fix trac ticket #2248.
Stefano Sabatini [Thu, 7 Feb 2013 20:00:54 +0000 (21:00 +0100)]
lavfi/select: avoid double -> int lossy conversion in debug log
Stefano Sabatini [Thu, 7 Feb 2013 19:28:30 +0000 (20:28 +0100)]
doc/filters: remove another instance of '×'
Fix trac ticket #2247.
Michael Niedermayer [Thu, 7 Feb 2013 18:39:08 +0000 (19:39 +0100)]
af_biquad: avoid subtraction in loop
17% faster
Note the speedup is smaller if its done before
storing in the context (gcc 4.6.3 core i7)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Feb 2013 18:03:22 +0000 (19:03 +0100)]
af_biquad: unroll loop, remove variable copies
This makes the code about 7% faster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Feb 2013 15:11:23 +0000 (16:11 +0100)]
sws: dont write out of array on bigendian
Fixes Ticket2229
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Feb 2013 14:00:29 +0000 (15:00 +0100)]
x86/dsputil: 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 [Thu, 7 Feb 2013 13:35:36 +0000 (14:35 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dsputil: x86: Fix compile error
dsputil: x86: Convert h263 loop filter to yasm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Feb 2013 13:28:26 +0000 (14:28 +0100)]
Merge commit '
12b54a1f39fee22fa0399825ae47a43e60bad4c5 '
* commit '
12b54a1f39fee22fa0399825ae47a43e60bad4c5 ':
mpegvideo: remove an unused function parameter
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Feb 2013 13:02:19 +0000 (14:02 +0100)]
Merge commit '
605b047bcc48482dc8a356f56629da259fbddbf1 '
* commit '
605b047bcc48482dc8a356f56629da259fbddbf1 ':
rv10: improve buffer size check.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Feb 2013 12:54:06 +0000 (13:54 +0100)]
error_resilience: assert that unsupported B frame interpolation isnt used with h264
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Feb 2013 12:48:56 +0000 (13:48 +0100)]
Merge commit '
c5fcdb440237f06f6c954185ab60970cabf786a2 '
* commit '
c5fcdb440237f06f6c954185ab60970cabf786a2 ':
error_resilience: remove a useless if() and FIXME
h264: remove silly macros
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Feb 2013 12:42:56 +0000 (13:42 +0100)]
Merge commit '
ca1fe6c0e60808da45d4dfd8728f45e843b9f9b0 '
* commit '
ca1fe6c0e60808da45d4dfd8728f45e843b9f9b0 ':
h263: remove an unused parameter from ff_h263_decode_init_vlc
flac: add channel layout masks for streams with 7 or 8 channels.
flac: don't check the number of channels before setting the channel layout.
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Feb 2013 12:35:49 +0000 (13:35 +0100)]
Merge commit '
a846dccb29d2bb0798af1d47d06100eda9ca87cc '
* commit '
a846dccb29d2bb0798af1d47d06100eda9ca87cc ':
h264chroma: x86: Fix building with yasm disabled
rv34: Drop now unnecessary dsputil dependencies
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 7 Feb 2013 12:09:35 +0000 (13:09 +0100)]
Merge commit '
79dad2a932534d1155079f937649e099f9e5cc27 '
* commit '
79dad2a932534d1155079f937649e099f9e5cc27 ':
dsputil: Separate h264chroma
Conflicts:
libavcodec/dsputil_template.c
libavcodec/ppc/dsputil_ppc.c
libavcodec/vc1dec.c
libavcodec/vc1dsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Wed, 6 Feb 2013 13:22:43 +0000 (14:22 +0100)]
lavfi: fix missing space in error message.
Nicolas George [Wed, 6 Feb 2013 13:22:15 +0000 (14:22 +0100)]
lavfi: remove disabled code.