OSDN Git Service
Michael Niedermayer [Sun, 21 Oct 2012 15:09:36 +0000 (17:09 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: adpcm: cosmetics: Sort test entries
fate: adpcm: Add dependencies
svq3: cosmetics: Drop useless parentheses
Conflicts:
libavcodec/svq3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 21 Oct 2012 14:32:41 +0000 (16:32 +0200)]
Merge commit '
a7d2861d36756b913e85681b86ed3385274e8ced'
* commit '
a7d2861d36756b913e85681b86ed3385274e8ced':
svq3: K&R formatting cosmetics
fate: Introduce ENCMUX macro for tests that require encoders and a muxer
ffv1: Add missing #includes to header file
Conflicts:
libavcodec/ffv1.h
libavcodec/svq3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 21 Oct 2012 14:03:31 +0000 (16:03 +0200)]
Merge commit '
2d09b36c0379fcda8f984bc8ad8816c8326fd7bd'
* commit '
2d09b36c0379fcda8f984bc8ad8816c8326fd7bd':
doc/platform: Add info on shared builds with MSVC
doc/platform: Move a caveat down to the notes section
ARM: reinstate optimised intmath.h
ffv1: update to ffv1 version 3
Conflicts:
doc/platform.texi
libavcodec/ffv1.c
libavcodec/ffv1.h
libavcodec/ffv1dec.c
libavcodec/ffv1enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 21 Oct 2012 12:54:16 +0000 (14:54 +0200)]
Merge commit '
4a2a4524a3f50ed302820ba971ddd48e78c7436f'
* commit '
4a2a4524a3f50ed302820ba971ddd48e78c7436f':
ffv1: propagate errors
Conflicts:
libavcodec/ffv1dec.c
libavcodec/ffv1enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 21 Oct 2012 12:35:47 +0000 (14:35 +0200)]
Merge commit '
71f7b22dba60524b2285643ae0b49d8f64977129'
* commit '
71f7b22dba60524b2285643ae0b49d8f64977129':
ffv1: split decoder and encoder
Conflicts:
libavcodec/Makefile
libavcodec/ffv1.c
libavcodec/ffv1.h
libavcodec/ffv1dec.c
libavcodec/ffv1enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 21 Oct 2012 12:05:46 +0000 (14:05 +0200)]
ffv1: split decoder and encoder
This is not based on lucas work due to code divergence (its less work this way
than trying to merge from a split based on 2 years outdated code)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 21 Oct 2012 11:29:03 +0000 (13:29 +0200)]
Merge commit '
d15c21e5fa3961f10026da1a3080a3aa3cf4cec9'
* commit '
d15c21e5fa3961f10026da1a3080a3aa3cf4cec9':
avutil: Add a copy of ff_sqrt_tab back into avutil to restore ABI compatibility
avutil: make some tables visible again
avutil: remove inline av_log2 from public API
celp_math: rename ff_log2 to ff_log2_q15
Conflicts:
libavutil/libavutil.v
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 21 Oct 2012 02:25:30 +0000 (04:25 +0200)]
ffv1: fix gray
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 21 Oct 2012 00:42:16 +0000 (02:42 +0200)]
mp3demux: Rewrite xing TOC based seeking
The libav code depends on mp3 startcodes only occuring at the start of
frames. But there is nothing in mp3 that prevents them occuring elsewhere
by chance. Thus the code would fail randomly, the new code searches for 3
consecutive valid frames. If this turns out to be still insufficient the
number can be raised further, or additional checks added.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 20 Oct 2012 23:31:53 +0000 (01:31 +0200)]
mp3dec: propagate error code correctly.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sat, 20 Oct 2012 23:28:19 +0000 (01:28 +0200)]
lavfi/silencedetect: increase duration precision.
This should also fix CID717889.
Clément Bœsch [Sat, 20 Oct 2012 23:16:49 +0000 (01:16 +0200)]
lavf/webvttdec: fix potential timing overflows.
Should fix CID733781 and CID733782.
Clément Bœsch [Sat, 20 Oct 2012 23:08:17 +0000 (01:08 +0200)]
lavf/subviewerdec: fix potential timing overflows.
Should fix CID733779 and CID733780.
Michael Niedermayer [Sat, 20 Oct 2012 21:31:32 +0000 (23:31 +0200)]
udp: add missing mutex unlock
Fixes CID703688
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 20 Oct 2012 21:07:16 +0000 (23:07 +0200)]
rtpdec: check av_new_packet() return value
Fixes CID733715
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 20 Oct 2012 20:57:30 +0000 (22:57 +0200)]
rtmp_write_amf_data: remove dead code
Fixes CID732199
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 20 Oct 2012 20:34:01 +0000 (22:34 +0200)]
riff_has_valid_tags: remove unused variable
Fixes CID739471
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Fri, 19 Oct 2012 21:32:12 +0000 (23:32 +0200)]
fate: adpcm: cosmetics: Sort test entries
This also places tests of related formats together.
Diego Biurrun [Fri, 19 Oct 2012 16:03:10 +0000 (18:03 +0200)]
svq3: K&R formatting cosmetics
Diego Biurrun [Fri, 19 Oct 2012 23:13:56 +0000 (01:13 +0200)]
fate: adpcm: Add dependencies
Diego Biurrun [Sat, 20 Oct 2012 13:40:15 +0000 (15:40 +0200)]
fate: Introduce ENCMUX macro for tests that require encoders and a muxer
Diego Biurrun [Fri, 19 Oct 2012 16:26:54 +0000 (18:26 +0200)]
svq3: cosmetics: Drop useless parentheses
Diego Biurrun [Sat, 20 Oct 2012 19:09:25 +0000 (21:09 +0200)]
ffv1: Add missing #includes to header file
Michael Niedermayer [Sat, 20 Oct 2012 18:45:32 +0000 (20:45 +0200)]
nutdec: fix integer overflow
Fixes CID700575
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 20 Oct 2012 18:12:13 +0000 (20:12 +0200)]
nsvdec: fix division by 0
Fixes CID717749
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 20 Oct 2012 17:48:26 +0000 (19:48 +0200)]
avformat_free_context: allow NULL as argument
Fixes CID703682
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 20 Oct 2012 17:08:41 +0000 (19:08 +0200)]
mmsh: fix integer overflow in mmsh_seek()
Fixes CID703745
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sat, 20 Oct 2012 09:07:16 +0000 (11:07 +0200)]
examples/decoding_encoding: prefer 'frame' over 'picture' for an AVFrame
Decrease confusion.
Michael Niedermayer [Sat, 20 Oct 2012 16:47:44 +0000 (18:47 +0200)]
matroskaenc: Fix hypothetical integer overflows
Fixes CID700562-7
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 20 Oct 2012 16:38:36 +0000 (18:38 +0200)]
matroskaenc: check avio_open_dyn_buf() retuen code
Fixes CID703629
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Derek Buitenhuis [Fri, 19 Oct 2012 19:12:07 +0000 (15:12 -0400)]
doc/platform: Add info on shared builds with MSVC
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Fri, 19 Oct 2012 18:19:26 +0000 (14:19 -0400)]
doc/platform: Move a caveat down to the notes section
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Fri, 19 Oct 2012 19:12:07 +0000 (15:12 -0400)]
doc/platform: Add info on shared builds with MSVC
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Fri, 19 Oct 2012 18:19:26 +0000 (14:19 -0400)]
doc/platform: Move a caveat down to the notes section
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Mans Rullgard [Sat, 20 Oct 2012 14:29:32 +0000 (15:29 +0100)]
ARM: reinstate optimised intmath.h
Use of the ARM optimised intmath.h was accidentally dropped in
9734b8b.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Luca Barbato [Fri, 19 Oct 2012 10:14:22 +0000 (12:14 +0200)]
ffv1: update to ffv1 version 3
Based on code from Carl Eugen Hoyos, Michael Niedermayer and Paul B Mahol.
Luca Barbato [Fri, 19 Oct 2012 08:33:43 +0000 (10:33 +0200)]
ffv1: propagate errors
Luca Barbato [Fri, 19 Oct 2012 08:19:36 +0000 (10:19 +0200)]
ffv1: split decoder and encoder
Hendrik Leppkes [Sat, 20 Oct 2012 04:43:48 +0000 (06:43 +0200)]
Replace usage of the deprecated av_pix_fmt_descriptors array with av_pix_fmt_desc_get
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 20 Oct 2012 14:58:33 +0000 (16:58 +0200)]
matroskadec: fix double negation typo
Fixes CID602563
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 20 Oct 2012 14:55:45 +0000 (16:55 +0200)]
matroska_parse_rm_audio: check for malloc failure
Fixes CID733712
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 20 Oct 2012 13:32:59 +0000 (15:32 +0200)]
bgmc: check the correct pointers
Fixes CID90539, CID90538
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 20 Oct 2012 11:59:53 +0000 (13:59 +0200)]
lavc: revert broken hunk from
1cd9c81ddb317ca00061d11d3562d3a34888d91b
This should fix fate failures
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Sat, 20 Oct 2012 10:32:01 +0000 (13:32 +0300)]
avutil: Add a copy of ff_sqrt_tab back into avutil to restore ABI compatibility
Earlier versions of for instance of libavcodec expect this symbol to be
present in libavutil. This commit can be reverted after the next major
bump.
New shared builds of avcodec will link to the internal copy of the
table within that library, so those builds won't rely on this table
being present in avutil any longer either.
Signed-off-by: Martin Storsjö <martin@martin.st>
Reinhard Tartler [Fri, 19 Oct 2012 21:34:02 +0000 (23:34 +0200)]
avutil: make some tables visible again
These tables are used for instance by older versions of libavcodec and
need to remain visible until the next SONAME bump.
Signed-off-by: Martin Storsjö <martin@martin.st>
Mans Rullgard [Thu, 18 Oct 2012 17:15:38 +0000 (18:15 +0100)]
avutil: remove inline av_log2 from public API
This removes inline av_log2 and av_log2_16bit from the public API,
instead exporting them as regular functions. In-tree code still
gets the inline and otherwise optimised variants.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Thu, 18 Oct 2012 16:59:13 +0000 (17:59 +0100)]
celp_math: rename ff_log2 to ff_log2_q15
This name is more descriptive as the function returns a fixed-point
value with 15 fraction bits.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Michael Niedermayer [Sat, 20 Oct 2012 11:18:59 +0000 (13:18 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Group math functions into a separate variable
avutil/mem: K&R formatting cosmetics
avutil/lzo: K&R formatting cosmetics
Conflicts:
configure
libavutil/mem.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 20 Oct 2012 10:37:52 +0000 (12:37 +0200)]
Merge commit '
c9ef43215c7d68c2cdcdbe02287aa114f27a32ed'
* commit '
c9ef43215c7d68c2cdcdbe02287aa114f27a32ed':
fate-vc1: add dependencies
ARM: fix overreads in neon h264 chroma mc
rtsp: Make sure the ret variable is initialized in ff_rtsp_fetch_packet
gitignore: ignore files created by msvc
fate: Add proper dependencies for the tests in video.mak
configure: Disable Snow decoder and encoder by default
lzo: Drop obsolete fast_memcpy reference
build: Drop OBJS declaration for non-existing PCM_DVD encoder
mpeg4videodec: Disable frame multithreading for GMC, its not implemented at all
Conflicts:
libavcodec/mpegvideo.c
libavformat/rtsp.c
tests/fate/microsoft.mak
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Tue, 16 Oct 2012 16:15:58 +0000 (18:15 +0200)]
lavu/parseutils: rework rational reduction logic in av_parse_ratio()
Avoid to divide num and den by gcd in case of a parsed expression, since
that is already done in av_d2q(), and force reduction in case of "a:b"
form, allowing to honour the max parameter.
The latter change is consistent with the a/b case, and with the
documentation.
Stefano Sabatini [Sat, 20 Oct 2012 09:53:22 +0000 (11:53 +0200)]
examples/scaling_video: remove unnecessary intermediary variable in fill_yuv_frame()
Stefano Sabatini [Tue, 16 Oct 2012 11:26:51 +0000 (13:26 +0200)]
lavc/utils: fix a few case/punctuation inconsistencies in avcodec_open2()
Stefano Sabatini [Mon, 15 Oct 2012 13:21:00 +0000 (15:21 +0200)]
lavc/utils: extend feedback provided by avcodec_open2()
Stefano Sabatini [Sat, 20 Oct 2012 09:28:07 +0000 (11:28 +0200)]
examples/decoding_encoding: fix misc typos in the usage text
Stefano Sabatini [Sat, 20 Oct 2012 09:00:17 +0000 (11:00 +0200)]
examples/decoding_encoding: remove misplaced and confusing comment
Stefano Sabatini [Sat, 20 Oct 2012 08:59:02 +0000 (10:59 +0200)]
examples/decoding_encoding: add missing checks on avcodec_alloc_context3()
Diego Biurrun [Fri, 19 Oct 2012 16:58:39 +0000 (18:58 +0200)]
configure: Group math functions into a separate variable
This avoids some duplication when listing and testing for the functions.
Diego Biurrun [Thu, 18 Oct 2012 17:16:37 +0000 (19:16 +0200)]
avutil/mem: K&R formatting cosmetics
Diego Biurrun [Thu, 18 Oct 2012 17:15:43 +0000 (19:15 +0200)]
avutil/lzo: K&R formatting cosmetics
Mans Rullgard [Thu, 18 Oct 2012 02:18:39 +0000 (03:18 +0100)]
fate-vc1: add dependencies
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Fri, 19 Oct 2012 12:39:11 +0000 (13:39 +0100)]
ARM: fix overreads in neon h264 chroma mc
The loops were reading ahead one line, which could end up outside the
buffer for reference blocks at the edge of the picture. Removing
this readahead has no measurable performance impact.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Hendrik Leppkes [Fri, 19 Oct 2012 19:35:40 +0000 (21:35 +0200)]
swresample: include ff_log2_tab for shared builds
This is done in accordance with all other libraries, which no longer access ff_log2_tab from avutil directly for shared builds, and instead obtain their own copy.
This change is required for MSVC DLL builds, as well as avoids accessing a private symbol from another library.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Fri, 19 Oct 2012 19:35:39 +0000 (21:35 +0200)]
Mark data symbols shared between libraries with av_export
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Wed, 17 Oct 2012 13:46:29 +0000 (16:46 +0300)]
rtsp: Make sure the ret variable is initialized in ff_rtsp_fetch_packet
Signed-off-by: Martin Storsjö <martin@martin.st>
Hendrik Leppkes [Sun, 23 Sep 2012 11:52:52 +0000 (13:52 +0200)]
vc1: only disable interlaced b-frames for software decoding
Tested-by: Gwenole Beauchesne <gb.devel@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Fri, 13 Jan 2012 21:13:51 +0000 (22:13 +0100)]
vc1: implement vc1 field interlaced dxva2 decoding
Tested-by: Gwenole Beauchesne <gb.devel@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 19 Oct 2012 21:24:03 +0000 (23:24 +0200)]
hlsproto: fix integer overflow
Fixes CID703743
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 19 Oct 2012 21:21:41 +0000 (23:21 +0200)]
gxfenc: fix null ptr dereference
Fixes CID703677
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 19 Oct 2012 21:00:47 +0000 (23:00 +0200)]
hls: fix integer overflow
Fixes CID717892
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 19 Oct 2012 20:35:32 +0000 (22:35 +0200)]
avio: fix sizeof argument
Fixes CID732284
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Fri, 19 Oct 2012 20:07:10 +0000 (22:07 +0200)]
gitignore: ignore files created by msvc
exp files are created in every build and contain export information
of the libraries. Both pdb and ilk are created during debug builds,
and contain linking and debug information used by MSVC.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Fri, 19 Oct 2012 20:14:13 +0000 (22:14 +0200)]
url_alloc_for_protocol: fix use of uninitialized variable
Fixes CID703830
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 19 Oct 2012 19:46:39 +0000 (21:46 +0200)]
avidec: remove unneeded null check
Fixes CID29555
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 19 Oct 2012 17:55:01 +0000 (19:55 +0200)]
vf_mp: fix null ptr deref in case of ENOMEM
Fixes CID703675
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 19 Oct 2012 17:51:33 +0000 (19:51 +0200)]
vf_mp: check list in querry_format()
Fixes CID717772
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 19 Oct 2012 17:35:31 +0000 (19:35 +0200)]
vf_idet: reorder operations to avoid division by 0
Fixes CID733738
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Thu, 18 Oct 2012 22:40:47 +0000 (01:40 +0300)]
fate: Add proper dependencies for the tests in video.mak
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Fri, 19 Oct 2012 16:44:28 +0000 (18:44 +0200)]
utvideoenc: fix theoretical integer overflow
The image sizes needed for this overflow to happen are currently not
supported in lavc, thus this should have no effect execpt making the
code more robust in light of future changes.
Fixes CID732245
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 19 Oct 2012 16:38:53 +0000 (18:38 +0200)]
avcodec_align_dimensions2: add missing breaks
This should have just cosmetic effects
Fixes CID603265
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ash Hughes [Fri, 19 Oct 2012 01:12:56 +0000 (01:12 +0000)]
lavc: enable recursively using avcodec_open2/close.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Mon, 15 Oct 2012 21:56:38 +0000 (23:56 +0200)]
configure: Disable Snow decoder and encoder by default
Snow has serious unfixed bugs and no real-world use.
Diego Biurrun [Thu, 18 Oct 2012 14:53:42 +0000 (16:53 +0200)]
lzo: Drop obsolete fast_memcpy reference
Diego Biurrun [Fri, 19 Oct 2012 14:16:06 +0000 (16:16 +0200)]
build: Drop OBJS declaration for non-existing PCM_DVD encoder
Petter Ericson [Wed, 17 Oct 2012 14:53:19 +0000 (16:53 +0200)]
mov.c: Check for stsd + m1s tag indicating MOV-wrapped MPEG-PS, and force continued probing if found.
Fixes Ticket241
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Oct 2012 20:38:54 +0000 (22:38 +0200)]
mpeg4videodec: Disable frame multithreading for GMC, its not implemented at all
Signed-off-by: Martin Storsjö <martin@martin.st>
jamal [Fri, 19 Oct 2012 05:22:12 +0000 (02:22 -0300)]
fate: Handle lavf-fate tests in a makefile
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 19 Oct 2012 12:15:47 +0000 (14:15 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: Add proper dependencies in qt.mak
fate: Add proper dependencies in lossless-video.mak
indeo3: do not try to output more lines than we can fit
bmv: get a new frame on every decode_frame(), so we can use direct rendering
Conflicts:
libavcodec/bmv.c
tests/fate/lossless-video.mak
tests/fate/qt.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 19 Oct 2012 11:58:14 +0000 (13:58 +0200)]
Merge commit '
1cd432e167b1a80853760c89a33606e2b5f229c2'
* commit '
1cd432e167b1a80853760c89a33606e2b5f229c2':
configure: fix libcdio check
rtsp: Allow setting the reordering buffer size via an AVOption
rtsp: Vertically align a constant definition
rtp: Update the check for distinguishing between RTP and RTCP
aac: fix build with hardcoded tables
fate: dependencies for screen codec tests
riff: Move functions around to be covered by appropriate #ifdefs
Conflicts:
configure
tests/fate/screen.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 19 Oct 2012 11:47:47 +0000 (13:47 +0200)]
Merge commit '
0af1fe845a9d7112da0a58d33a4fc81fe7c47e95'
* commit '
0af1fe845a9d7112da0a58d33a4fc81fe7c47e95':
avformat: Fix references to the removed function av_write_header in comments
changelog: Mention the MSVC DLL support
fate: add dependencies for misc microsoft codecs
fate-twinvq: add dependencies
fate-mpc: add dependencies
fate-indeo: add dependencies
fate-als: add dependencies
fate: dependencies for demux tests
Conflicts:
Changelog
tests/Makefile
tests/fate/demux.mak
tests/fate/microsoft.mak
tests/fate/mpc.mak
tests/fate/vqf.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 19 Oct 2012 11:29:24 +0000 (13:29 +0200)]
Merge commit '
c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72'
* commit '
c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72':
fate: add a dependency helper macro
Add support for building shared libraries with MSVC
avcodec: Rename avpriv_frame_rate_tab to ff_mpeg12_frame_rate_tab
gxf: Add a local copy of the relevant parts of the frame rate table
configure: Split out msvc as a separate target OS
aviobuf: Remove a senseless ifdef in avio_seek
Conflicts:
configure
libavcodec/dirac.c
libavcodec/mpeg12data.h
libavcodec/mpeg12enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Thu, 18 Oct 2012 22:49:15 +0000 (01:49 +0300)]
fate: Add proper dependencies in qt.mak
The output of make fate-list is identical to before.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 18 Oct 2012 21:35:32 +0000 (00:35 +0300)]
fate: Add proper dependencies in lossless-video.mak
The output of make fate-list is identical to before.
Signed-off-by: Martin Storsjö <martin@martin.st>
Kostya Shishkov [Thu, 18 Oct 2012 09:45:42 +0000 (11:45 +0200)]
indeo3: do not try to output more lines than we can fit
Internally chroma planes have multiple of four height while allocated image
planes might be smaller if CODEC_FLAG_EMU_EDGE is set. Thus we should not
output more lines of chroma than frame can accept.
Also the decoder can be safely switched to direct rendering now.
Kostya Shishkov [Thu, 18 Oct 2012 09:08:01 +0000 (11:08 +0200)]
bmv: get a new frame on every decode_frame(), so we can use direct rendering
Michael Niedermayer [Fri, 19 Oct 2012 01:36:42 +0000 (03:36 +0200)]
tiffenc: fix integer overflow
Fixes CID700699
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 19 Oct 2012 01:15:06 +0000 (03:15 +0200)]
roqvideodec: replace dead code by assert
Fixes CID732195
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 19 Oct 2012 00:53:06 +0000 (02:53 +0200)]
roqaudioenc: Fix crash with very small roq files
Fixes CID703669
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Wed, 17 Oct 2012 08:27:54 +0000 (08:27 +0000)]
lavc/tta: do not overwrite bits_per_coded_sample
It is supposed to be set in libavformat only.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 17 Oct 2012 15:42:24 +0000 (15:42 +0000)]
kmvc: use meaningful error codes
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 17 Oct 2012 14:45:00 +0000 (14:45 +0000)]
xxan: return more meaningful error codes
Signed-off-by: Paul B Mahol <onemda@gmail.com>