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, 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>
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.
Michael Niedermayer [Wed, 6 Feb 2013 21:48:59 +0000 (22:48 +0100)]
mov: remove unused function
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Tim Walker [Thu, 7 Feb 2013 09:36:21 +0000 (09:36 +0000)]
flac: don't check the number of channels before setting the channel layout
This is unnecessary, as ff_flac_set_channel_layout can handle any number of channels.
Daniel Kang [Thu, 7 Feb 2013 03:25:12 +0000 (22:25 -0500)]
dsputil: x86: Fix compile error
Accidentally prefixed ff_ with cextern.
Signed-off-by: Martin Storsjö <martin@martin.st>
rogerdpack [Thu, 7 Feb 2013 06:37:46 +0000 (23:37 -0700)]
dshow: attempt to build shared as well as static
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Daniel Kang [Wed, 6 Feb 2013 18:05:43 +0000 (18:05 +0000)]
dsputil: x86: Convert h263 loop filter to yasm
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Stefano Sabatini [Wed, 6 Feb 2013 21:40:18 +0000 (22:40 +0100)]
doc: replace '×' symbol with 'x'
Non-ascii chars are not correctly rendered in both MAN and HTML output or
may even cause compilation failure. Thus avoid to use them until we find
a satisfying way to deal with them.
Fix trac ticket #2243.
Stefano Sabatini [Tue, 5 Feb 2013 23:19:52 +0000 (00:19 +0100)]
lavf/segment: fix DTS inconsistencies with -reset_timestamps
The DTS needs to be resynched against the segment start PTS, or the
resulting DTS may result < PTS.
Reported-by: Owen Jones <riots6@gmail.com>
See thread:
Subject: [FFmpeg-user] pts/dts error using reset_timestamps while splitting a DVD
Date: Sat, 19 Jan 2013 08:58:27 +0000
Matthieu Bouron [Mon, 4 Feb 2013 21:06:11 +0000 (22:06 +0100)]
lavf/mov: skip version and flags attributes in mov_read_chan function
Fixes ticket #1764.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Sun, 3 Feb 2013 12:13:00 +0000 (13:13 +0100)]
mpegvideo: remove an unused function parameter
Anton Khirnov [Sun, 3 Feb 2013 07:42:02 +0000 (08:42 +0100)]
rv10: improve buffer size check.
Check slice count and input buffer size before constructing a possibly
invalid pointer, not after.
Anton Khirnov [Sat, 2 Feb 2013 16:23:19 +0000 (17:23 +0100)]
error_resilience: remove a useless if() and FIXME
pp_time is never set for h264
Anton Khirnov [Mon, 4 Feb 2013 13:46:55 +0000 (14:46 +0100)]
h264: remove silly macros
They serve no useful purpose and wreak all kind of havoc when h264.h is
included elsewhere.
Anton Khirnov [Sun, 3 Feb 2013 07:32:39 +0000 (08:32 +0100)]
h263: remove an unused parameter from ff_h263_decode_init_vlc
Tim Walker [Tue, 22 Jan 2013 20:53:54 +0000 (21:53 +0100)]
flac: add channel layout masks for streams with 7 or 8 channels.
They were added to the latest FLAC specification:
https://git.xiph.org/?p=flac-website.git;a=commit;h=
65c199a2
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Tim Walker [Tue, 22 Jan 2013 20:53:53 +0000 (21:53 +0100)]
flac: don't check the number of channels before setting the channel layout.
This is unnecessary, as ff_flac_set_channel_layout can handle any number of channels.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Wed, 6 Feb 2013 19:14:09 +0000 (20:14 +0100)]
Merge remote-tracking branch 'rdp/combined2'
* rdp/combined2:
dshow: allow for more codec ID's
dshow: better error reporting
dshow: fix log message
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 6 Feb 2013 17:17:27 +0000 (18:17 +0100)]
framecrcenc: print all side data elements, not just the first
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 6 Feb 2013 17:17:03 +0000 (18:17 +0100)]
framecrcenc: Also print the size of side data elements
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vignesh Venkatasubramanian [Tue, 5 Feb 2013 20:10:21 +0000 (12:10 -0800)]
Fate test to print side_data crc if present
Modified the fate test crc generator to print the side_data's
crc if side_data is present.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 6 Feb 2013 15:59:32 +0000 (16:59 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegvideo: initialize dummy reference frames.
Conflicts:
libavcodec/mpegvideo.c
tests/ref/fate/filter-yadif-mode1
The luma init is left at 0x80 as it was previously, and tested and
working since a long time. Its also mandated to be 0x80 by at least
one specification. Cases that need different values already had
code in place to handle them.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 6 Feb 2013 15:46:23 +0000 (16:46 +0100)]
qtrle: fix 1bit row_ptr comment
Found-by: aballier
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 6 Feb 2013 15:36:08 +0000 (16:36 +0100)]
Merge commit '
dff6197dfb9b2d145729885c63f865c5fdd184aa'
* commit '
dff6197dfb9b2d145729885c63f865c5fdd184aa':
nuv: do not rely on get_buffer() initializing the frame.
yop: initialize palette to 0
Conflicts:
libavcodec/nuv.c
tests/ref/fate/nuv-rtjpeg-fh
tests/ref/fate/yop
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 6 Feb 2013 15:09:25 +0000 (16:09 +0100)]
Merge commit '
8136f234445862c94d1c081606b2d1e3d44fccf3'
* commit '
8136f234445862c94d1c081606b2d1e3d44fccf3':
yop: check for input overreads.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Wed, 6 Feb 2013 14:34:39 +0000 (16:34 +0200)]
h264chroma: x86: Fix building with yasm disabled
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Wed, 6 Feb 2013 15:05:06 +0000 (16:05 +0100)]
Merge commit '
06cf597c352519d2b70f293518c61b8c312f5d4f'
* commit '
06cf597c352519d2b70f293518c61b8c312f5d4f':
yop: check that extradata is large enough.
Conflicts:
libavcodec/yop.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 6 Feb 2013 14:56:24 +0000 (15:56 +0100)]
Merge commit '
89f11f498b9c15bc71494a11a7ec560f4adf630d'
* commit '
89f11f498b9c15bc71494a11a7ec560f4adf630d':
qtrle: fix the topmost line for 1bit
Conflicts:
tests/ref/fate/qtrle-1bit
See:
1af91978dbab35ba9fdede187577c00d643ae33b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 6 Feb 2013 14:26:24 +0000 (15:26 +0100)]
Merge commit '
685e6f2e3939f124b41c7801cc541dad8252af3d'
* commit '
685e6f2e3939f124b41c7801cc541dad8252af3d':
xxan: properly handle odd heights.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 6 Feb 2013 14:21:39 +0000 (15:21 +0100)]
Merge commit '
2cd4068071b9a8908823a3107f97e938211045ce'
* commit '
2cd4068071b9a8908823a3107f97e938211045ce':
fraps: fix off-by one bug for version 1.
Conflicts:
libavcodec/fraps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 6 Feb 2013 14:11:14 +0000 (15:11 +0100)]
Merge commit '
da7baaaae79b4d7d715d35ea6bcfbdd149edc177'
* commit '
da7baaaae79b4d7d715d35ea6bcfbdd149edc177':
aasc: fix output for msrle compression.
msrledec: check bounds before constructing a possibly invalid pointer,
cmdutils: remove ansi from the list of broken codecs.
Conflicts:
tests/ref/fate/aasc
Also See:
e7117f1c1058d41eb759d1613e849c29b15c85b5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 6 Feb 2013 13:53:49 +0000 (14:53 +0100)]
Merge commit '
238614de679a71970c20d7c3fee08a322967ec40'
* commit '
238614de679a71970c20d7c3fee08a322967ec40':
cdgraphics: do not rely on get_buffer() initializing the frame.
svq1: replace struct svq1_frame_size with an array.
vf_yadif: silence a warning.
Conflicts:
libavcodec/svq1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 6 Feb 2013 13:10:26 +0000 (14:10 +0100)]
Merge commit '
48a4ffa722c0874b251de9d201babed52cef0bcb'
* commit '
48a4ffa722c0874b251de9d201babed52cef0bcb':
asf: K&R formatting cosmetics
vc1dec: use codec_id instead of codec_tag for VC1IMAGE
sh4: drop unused functions
Conflicts:
libavformat/asf.c
libavformat/asfdec.c
libavformat/asfenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Tim Walker [Wed, 6 Feb 2013 12:53:15 +0000 (12:53 +0000)]
flac: add channel layout masks for streams with 7 or 8 channels
They were added to the latest FLAC specification:
https://git.xiph.org/?p=flac-website.git;a=commit;h=
65c199a2