OSDN Git Service
Michael Niedermayer [Sat, 17 Nov 2012 19:17:22 +0000 (20:17 +0100)]
vcr1: check if dimensions are supported, fix out of array accesses.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 17 Nov 2012 18:56:26 +0000 (19:56 +0100)]
electronicarts: check size before reading duration out of a chunk.
Fixes null pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Wed, 14 Nov 2012 17:53:22 +0000 (17:53 +0000)]
AST demuxer
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 15 Nov 2012 16:17:55 +0000 (16:17 +0000)]
PCM signed 16-bit big-endian planar decoder
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 16 Nov 2012 15:10:36 +0000 (15:10 +0000)]
lxfdec: remove deplanarization hack
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 16 Nov 2012 16:00:04 +0000 (16:00 +0000)]
PCM signed 24-bit/32-bit little-endian planar decoder
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Nicolas George [Sun, 11 Nov 2012 17:44:10 +0000 (18:44 +0100)]
doc/texi2pod: recognize @table @command.
Nicolas George [Sat, 10 Nov 2012 15:06:32 +0000 (16:06 +0100)]
lavfi/drawtext: use bprint for the expanded text.
Nicolas George [Sat, 10 Nov 2012 15:05:53 +0000 (16:05 +0100)]
lavu/bprint: implement av_bprint_strftime().
Michael Niedermayer [Sat, 17 Nov 2012 17:47:36 +0000 (18:47 +0100)]
flvdec: disable hack that attempts to parse aac bitstream in the flv demuxer.
I was unable to find a file that needs this hack, if you have one please
contact us!
Fixes out of array accesses.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 17 Nov 2012 15:26:55 +0000 (16:26 +0100)]
eamad: fix out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 17 Nov 2012 12:06:12 +0000 (13:06 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
FATE: add a bink version 'b' test
FATE: add a bink version 'i' test
libswscale: remove unnecessary direct #if LIBSWSCALE_VERSION_MAJOR
Conflicts:
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 17 Nov 2012 11:58:00 +0000 (12:58 +0100)]
Merge commit '
8f5587c3d0bc4b5f075e4282215bda91a21fc12e'
* commit '
8f5587c3d0bc4b5f075e4282215bda91a21fc12e':
cpu.h: define AV_CPU_FLAG_MMX2 for libavutil major 52
h264: Fix parameters to ff_er_add_slice() call
h264: always check ref_count for validity
Conflicts:
libavcodec/h264.c
libavutil/cpu.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Sat, 17 Nov 2012 10:24:01 +0000 (11:24 +0100)]
cmdutils: free the report file name.
Fix coverity issue 743443, which was a harmless leak.
Nicolas George [Sun, 11 Nov 2012 20:37:50 +0000 (21:37 +0100)]
configure: add --fatal-warnings option.
Nicolas George [Sun, 11 Nov 2012 20:29:27 +0000 (21:29 +0100)]
configure: warn when en/disabling has no effect.
Print a warning for --enable- or --disable-something=pattern
does not match any component.
Stefano Sabatini [Fri, 16 Nov 2012 11:02:22 +0000 (12:02 +0100)]
lavf/avienc: return proper error codes, and provide some more feedback
Anton Khirnov [Thu, 15 Nov 2012 08:56:54 +0000 (09:56 +0100)]
FATE: add a bink version 'b' test
Anton Khirnov [Thu, 15 Nov 2012 08:56:54 +0000 (09:56 +0100)]
FATE: add a bink version 'i' test
Michael Niedermayer [Sat, 17 Nov 2012 03:45:38 +0000 (04:45 +0100)]
xxan: check ybuf index before use.
Fixes out of array access
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 17 Nov 2012 02:42:48 +0000 (03:42 +0100)]
cook: check subbands more completely, fix out of array read.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 17 Nov 2012 01:31:11 +0000 (02:31 +0100)]
ff_mpeg4videodec_static_init: fix return type
Fixes CID743439
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 17 Nov 2012 01:20:50 +0000 (02:20 +0100)]
mxfdec: fix potential integer overflow in mxf_compute_sample_count()
Fixes CID743442
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 17 Nov 2012 01:08:12 +0000 (02:08 +0100)]
cpu: add a few cpu names as aliases for their cpu flags
Help to complete this list is welcome!
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 17 Nov 2012 01:04:30 +0000 (02:04 +0100)]
cpu: add cmov ro the table, which appears to have been forgotten
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 17 Nov 2012 00:09:20 +0000 (01:09 +0100)]
tm2: check for invalid vlcs, fix out of array read
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Wed, 14 Nov 2012 20:08:59 +0000 (21:08 +0100)]
pp: simplify postProcess().
Clément Bœsch [Wed, 14 Nov 2012 19:20:35 +0000 (20:20 +0100)]
pp: rework the way templating is done.
This refactoring simplifies the usage of the template: define the
profile and include the template is all that is required. It should now
be easier to add more instruction sets.
The HAVE_* flags are changed with TEMPLATE_PP_* setting to avoid messing
them up.
See the top comment in postprocess_template.c for details.
Michael Niedermayer [Fri, 16 Nov 2012 20:25:40 +0000 (21:25 +0100)]
g723_1dec: Fix lsp2lpc() so it can handle values at the ends of the table.
Fixes out of array reads
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 16 Nov 2012 19:57:35 +0000 (20:57 +0100)]
ff_emulated_edge_mc: fix integer anomalies, fix out of array reads
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Alexander Strasser [Sat, 3 Nov 2012 16:05:51 +0000 (17:05 +0100)]
dshow: Use NO_DSHOW_STRSAFE for all dshow header inclusions
Move the NO_DSHOW_STRSAFE macro definition in front of the dshow.h
system header inclusion.
This excludes the usage of the STRSAFE functions consistently.
Further background on this can be found in the commit message of
revision
05ee0db1 where the #define was initially introduced.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Michael Niedermayer [Fri, 16 Nov 2012 15:55:48 +0000 (16:55 +0100)]
ffv1enc: consider 2pass float rounding, fix loop
Found-by: "Peter B." <pb@das-werkstatt.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Fri, 16 Nov 2012 10:22:21 +0000 (11:22 +0100)]
doc/filters: fix a few typos in the frei0r docs
Stefano Sabatini [Fri, 16 Nov 2012 09:25:16 +0000 (10:25 +0100)]
doc/ffprobe: factorize definition of writers syntax
The writers option syntax was unified.
Janne Grunau [Fri, 16 Nov 2012 14:00:49 +0000 (15:00 +0100)]
libswscale: remove unnecessary direct #if LIBSWSCALE_VERSION_MAJOR
SWS_CPU_CAPS are deprecated and slated to removed with libswscale major
version 3. No need to provide a SWS_CPU_CAPS_MMX2 as backward
compatibility define under the same explicit condition.
Janne Grunau [Fri, 16 Nov 2012 13:55:08 +0000 (14:55 +0100)]
cpu.h: define AV_CPU_FLAG_MMX2 for libavutil major 52
Matthieu Bouron [Thu, 13 Sep 2012 19:15:48 +0000 (21:15 +0200)]
mxfdec: set audio packets pts
Also fix playback of ntsc files.
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Xidorn Quan [Thu, 15 Nov 2012 14:40:23 +0000 (22:40 +0800)]
mov: add more udta meta data recognition
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Fri, 16 Nov 2012 08:21:17 +0000 (10:21 +0200)]
lavf/mp3enc: make sure the header is valid before writing audio pkt.
An invalid header can lead avpriv_mpegaudio_decode_header() to overread
and/or div by zero.
Michael Niedermayer [Fri, 16 Nov 2012 12:23:35 +0000 (13:23 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: dsputil: port to cpuflags
crc: av_crc() parameter names should match between .c, .h and doxygen
avserver: replace av_read_packet with av_read_frame
avserver: fix constness casting warnings
Conflicts:
libavcodec/x86/dsputil.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Thu, 15 Nov 2012 15:21:41 +0000 (16:21 +0100)]
h264: Fix parameters to ff_er_add_slice() call
s->mb_x is reset to zero a couple of lines above. It does not make
sense to call ff_er_add_slice() with 0 as endx when the end of the
macroblock row was reached. Fixes unnecessary and counterproductive
error resilience in https://bugzilla.libav.org/show_bug.cgi?id=394.
CC: libav-stable@libav.org
Janne Grunau [Thu, 15 Nov 2012 21:03:58 +0000 (22:03 +0100)]
h264: always check ref_count for validity
Fixes a crash with zuffed files.
Michael Niedermayer [Fri, 16 Nov 2012 12:12:09 +0000 (13:12 +0100)]
ffserver: put NoDaemon back so as not not break existing conf files.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 16 Nov 2012 12:07:10 +0000 (13:07 +0100)]
Merge commit '
bf5f46b4cc47b7a4568119f224057d4ff91b6cdd'
* commit '
bf5f46b4cc47b7a4568119f224057d4ff91b6cdd':
APIChanges: add entry for av_read_packet deprecation
mxfdec: fix typo in mxf_read_seek()
avserver: use freopen to redirect stdin/out/err to /dev/null
avserver: remove daemon mode
configure: Check for -Werror parameters on clang
doxygen: remove obsolete options from Doxyfile
configure: Add option to disable all command line programs
Conflicts:
Changelog
configure
doc/APIchanges
doc/ffserver.conf
doc/ffserver.texi
ffserver.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Sun, 15 Jul 2012 13:45:11 +0000 (15:45 +0200)]
x86: dsputil: port to cpuflags
Diego Biurrun [Wed, 14 Nov 2012 00:40:25 +0000 (01:40 +0100)]
crc: av_crc() parameter names should match between .c, .h and doxygen
Nicolas George [Sat, 10 Nov 2012 12:03:09 +0000 (13:03 +0100)]
lavu/opt: fix av_opt_get_key_value() API.
Do not skip the end delimiter.
Reserve positive return values.
This is an API break, but the function was introduced less than
two weeks ago.
Nicolas George [Sat, 10 Nov 2012 12:14:48 +0000 (13:14 +0100)]
doc/APIchanges: clarify comment on new APIs.
Michael Niedermayer [Fri, 16 Nov 2012 02:46:35 +0000 (03:46 +0100)]
rv34: check image size before using it
fixes assertion failure
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 Nov 2012 23:48:15 +0000 (00:48 +0100)]
vc1dec: do not allow field_mode to change after the first header
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 [Thu, 15 Nov 2012 22:52:42 +0000 (23:52 +0100)]
swr/resample: fix SSSE3 included unconditionally.
10l Regression since
8ea88339.
Clément Bœsch [Sun, 8 Jul 2012 21:09:14 +0000 (23:09 +0200)]
pp: fix typo in avg() comment.
Clément Bœsch [Fri, 13 Jul 2012 17:05:54 +0000 (19:05 +0200)]
pp: use av_clip_uint8 instead of a custom implementation.
Clément Bœsch [Thu, 19 Jul 2012 19:19:20 +0000 (21:19 +0200)]
pp: fix a few typo in the internal header.
Clément Bœsch [Thu, 15 Nov 2012 20:48:36 +0000 (21:48 +0100)]
lavfi/geq: fix GPL license header.
100l: original code is GPL, header miscopied. LICENSE file and configure
dependency are fine.
Clément Bœsch [Wed, 14 Nov 2012 22:02:12 +0000 (23:02 +0100)]
swr/rematrix: move templating parameters to template itself.
Clément Bœsch [Wed, 14 Nov 2012 21:37:30 +0000 (22:37 +0100)]
swr/resample: move templating parameters to template itself.
It has various benefits such as allowing some refactoring, clarifying
the code in the inclusion part, and making the template understandable
in standalone.
This commit is based on the templating method used by Justin Ruggles for
libavresample.
Michael Niedermayer [Thu, 15 Nov 2012 18:15:35 +0000 (19:15 +0100)]
zmbv: avoid use of uninitialized data
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 Nov 2012 16:44:18 +0000 (17:44 +0100)]
vmdav: more complete check for block_align, prevent out of array access.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 Nov 2012 19:56:28 +0000 (20:56 +0100)]
flashsv: only realloc blocks for version 2
Fixes 10l regression introducing a memleak
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Thu, 25 Oct 2012 14:19:16 +0000 (16:19 +0200)]
avserver: replace av_read_packet with av_read_frame
Janne Grunau [Thu, 25 Oct 2012 13:55:05 +0000 (15:55 +0200)]
avserver: fix constness casting warnings
Use a different char* for extracting info string from the URL. The
other pointer can be made const then which elimates the need for a
cast and fixes the following warnings:
warning: to be safe all intermediate pointers in cast from ‘char **’ to
‘const char **’ must be ‘const’ qualified [-Wcast-qual]
Janne Grunau [Thu, 25 Oct 2012 14:26:06 +0000 (16:26 +0200)]
APIChanges: add entry for av_read_packet deprecation
Janne Grunau [Fri, 26 Oct 2012 18:01:43 +0000 (20:01 +0200)]
mxfdec: fix typo in mxf_read_seek()
Check the number of index tables before using byte offset based seeking
instead of the index_tables pointer.
Found by Måns Rullgård <mans@mansr.com>.
Janne Grunau [Thu, 25 Oct 2012 12:54:48 +0000 (14:54 +0200)]
avserver: use freopen to redirect stdin/out/err to /dev/null
Mans Rullgard [Wed, 25 Apr 2012 12:08:54 +0000 (12:08 +0000)]
avserver: remove daemon mode
This code spews a multitude of warnings with glibc (unchecked
return values), some of them possibly warranted. Furthermore,
the deamonisation is not suitable for use with typical startup
scripts as it does not provide the PID of the daemon in any way.
Users wishing to run avserver as a daemon can still do so using
start-stop-daemon or equivalent tools.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Martin Storsjö [Tue, 13 Nov 2012 17:01:51 +0000 (19:01 +0200)]
configure: Check for -Werror parameters on clang
Signed-off-by: Martin Storsjö <martin@martin.st>
Janne Grunau [Sat, 27 Oct 2012 22:43:12 +0000 (00:43 +0200)]
doxygen: remove obsolete options from Doxyfile
The options USE_INLINE_TREES, SHOW_DIRECTORIES and HTML_ALIGN_MEMBERS
became obsolete with doxygen 1.8.1 (releaded 2012-05-19). The generated
outpu for older doxygen versions should not change since they were set
to the default value.
Paul B Mahol [Wed, 14 Nov 2012 17:02:41 +0000 (17:02 +0000)]
pcm: give more descriptive name to codec
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Thu, 15 Nov 2012 15:41:28 +0000 (16:41 +0100)]
pgssubdec: check RLE size before copying. Fix out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 Nov 2012 15:09:23 +0000 (16:09 +0100)]
flashsv: reallocate block array independant of frame type.
Fixes NULL pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Thu, 15 Nov 2012 13:38:19 +0000 (14:38 +0100)]
Read QuickTime version 1 audio fields in broken mov files.
Matrox XMIO capture boards write files with major brand "JUNK"
and compatible brand "qt " that contain QuickTime version 1
audio fields.
Fixes ticket #1881.
Michael Niedermayer [Thu, 15 Nov 2012 11:22:16 +0000 (12:22 +0100)]
swr: move if() block into the only branch where it can be true.
This should make the code a tiny tiny bit faster.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 Nov 2012 11:20:45 +0000 (12:20 +0100)]
swr: reorder/redesign operations to avoid integer overflow.
This fixes a out of array read.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Tue, 13 Nov 2012 15:32:35 +0000 (17:32 +0200)]
ffserver: fix streams and priv_data memleaks when closing a connection.
Michael Niedermayer [Thu, 15 Nov 2012 10:31:13 +0000 (11:31 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
bgmc: Fix av_malloc checks in ff_bgmc_init()
rtp: set the payload type as stream id
Conflicts:
libavformat/rtpenc_chain.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 Nov 2012 10:12:25 +0000 (11:12 +0100)]
Merge commit '
3b4296f41473a5b39e84d7a49d480624c9c60040'
* commit '
3b4296f41473a5b39e84d7a49d480624c9c60040':
avformat: clarify stream id for muxing
fate: Add dependencies for aac, alac, amrnb, amrwb, atrac tests
ppc: do not pass redundant compiler flags
avutil: change GET_UTF8 to not use av_log2()
segment: fix NULL pointer dereference in seg_write_header()
Conflicts:
tests/fate/aac.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 Nov 2012 01:43:38 +0000 (02:43 +0100)]
ituh263dec: more complete w/h check.
Fixes a division by 0
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 Nov 2012 01:16:56 +0000 (02:16 +0100)]
rv10: always check image size not just in some cases.
Fixes division by 0
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 14 Nov 2012 23:56:33 +0000 (00:56 +0100)]
xwma: check bytes_per_sample, fix division by 0.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 14 Nov 2012 23:42:49 +0000 (00:42 +0100)]
dxa: dont try to use the previous frame if there is none.
Fixes null pointer dereference.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 14 Nov 2012 22:24:05 +0000 (23:24 +0100)]
bink: check quant_index, fix out of array read
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Sat, 10 Nov 2012 17:10:59 +0000 (18:10 +0100)]
configure: Add option to disable all command line programs
Xi Wang [Wed, 14 Nov 2012 18:45:24 +0000 (13:45 -0500)]
bgmc: Fix av_malloc checks in ff_bgmc_init()
Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Wed, 14 Nov 2012 21:59:22 +0000 (22:59 +0100)]
gifdec: check ff_lzw_decode_init() return value, fix out of array reads
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 14 Nov 2012 20:14:40 +0000 (21:14 +0100)]
wmaprodec: check num_sfb for validity. Fix out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Sat, 10 Nov 2012 15:20:30 +0000 (16:20 +0100)]
avformat: clarify stream id for muxing
Luca Barbato [Sun, 11 Nov 2012 19:44:28 +0000 (20:44 +0100)]
rtp: set the payload type as stream id
Support multiple video/audio streams with different format in the
same session.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Wed, 14 Nov 2012 18:15:32 +0000 (19:15 +0100)]
vpriv_adx_decode_header: avoid underreading the array.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 14 Nov 2012 18:03:07 +0000 (19:03 +0100)]
vc1dec: require a minimum of 2x2 for the edge pos. Avoid assertion failure
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Wed, 14 Nov 2012 18:00:17 +0000 (18:00 +0000)]
Add missing dependency for avr demuxer
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Wed, 14 Nov 2012 16:34:37 +0000 (17:34 +0100)]
vc1dec: check first field slices, fix out of array read.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Fri, 19 Oct 2012 23:12:18 +0000 (01:12 +0200)]
fate: Add dependencies for aac, alac, amrnb, amrwb, atrac tests
Mans Rullgard [Wed, 14 Nov 2012 00:07:13 +0000 (00:07 +0000)]
ppc: do not pass redundant compiler flags
The -mpowerpc64 and -mpowerpc-gfxopt flags are implicitly set by
-mcpu as needed. Passing them explicitly is redundant and can
conflict with user-supplied flags.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Tue, 13 Nov 2012 15:49:39 +0000 (15:49 +0000)]
avutil: change GET_UTF8 to not use av_log2()
This removes an inter-library dependency on ff_log2_tab causing
linking errors in some configurations.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Michael Niedermayer [Wed, 14 Nov 2012 13:07:58 +0000 (14:07 +0100)]
mov: Dont try to calculate with unknown durations, fix division by 0
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 14 Nov 2012 11:34:30 +0000 (12:34 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: mmx2 ---> mmxext in asm constructs
Conflicts:
libavcodec/x86/h264_chromamc_10bit.asm
libavcodec/x86/h264_deblock.asm
libavcodec/x86/h264dsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 14 Nov 2012 11:26:55 +0000 (12:26 +0100)]
Merge commit '
da39cac8def7ea73cad2fa2b611209663c7abe2c'
Not merged, its not broken
* commit '
da39cac8def7ea73cad2fa2b611209663c7abe2c':
Drop broken and unused CABAC test program.
Conflicts:
libavcodec/Makefile
libavcodec/cabac.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 14 Nov 2012 10:59:25 +0000 (11:59 +0100)]
Remove deprecation of avcodec_get_chroma_sub_sample.
Add explanations what the difference between the 2 functions are and
when either should be used.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 14 Nov 2012 10:22:40 +0000 (11:22 +0100)]
Merge commit '
5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2'
* commit '
5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2':
x86: h264_weight_10bit: port to cpuflags
libtheoraenc: add missing pixdesc.h header
avcodec: remove ff_is_hwaccel_pix_fmt
pixdesc: add av_pix_fmt_get_chroma_sub_sample
hlsenc: stand alone hls segmenter
Conflicts:
doc/muxers.texi
libavcodec/ffv1enc.c
libavcodec/imgconvert.c
libavcodec/mpegvideo_enc.c
libavcodec/tiffenc.c
libavformat/Makefile
libavformat/allformats.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>