8f42b09604
swr/resample: fix SSSE3 included unconditionally.
...
10l Regression since 8ea88339
2012-11-15 23:52:44 +01:00
5cd567cfb4
pp: fix typo in avg() comment.
2012-11-15 21:54:18 +01:00
4c0aece192
pp: use av_clip_uint8 instead of a custom implementation.
2012-11-15 21:54:13 +01:00
c4f317e7fe
pp: fix a few typo in the internal header.
2012-11-15 21:54:07 +01:00
b3bf9b1d97
lavfi/geq: fix GPL license header.
...
100l: original code is GPL, header miscopied. LICENSE file and configure
dependency are fine.
2012-11-15 21:48:39 +01:00
5e68bf9b92
swr/rematrix: move templating parameters to template itself.
2012-11-15 21:24:49 +01:00
8ea8833979
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.
2012-11-15 21:24:49 +01:00
e31b1938ac
zmbv: avoid use of uninitialized data
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-15 20:58:36 +01:00
c2409a7c5b
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>
2012-11-15 20:58:36 +01:00
ea3eaa37b1
flashsv: only realloc blocks for version 2
...
Fixes 10l regression introducing a memleak
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-15 20:58:35 +01:00
eca2eb2dfa
pcm: give more descriptive name to codec
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-11-15 16:04:35 +00:00
c0d68be555
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>
2012-11-15 16:46:51 +01:00
bc08ca841e
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>
2012-11-15 16:46:42 +01:00
850e5c041d
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 .
2012-11-15 14:38:19 +01:00
d53f447130
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>
2012-11-15 12:33:40 +01:00
17da2d9eee
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>
2012-11-15 12:33:40 +01:00
0e482a8e49
ffserver: fix streams and priv_data memleaks when closing a connection.
2012-11-15 11:52:44 +01:00
a9b1536a01
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>
2012-11-15 11:31:13 +01:00
4d941eac16
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>
2012-11-15 11:12:25 +01:00
62006b539d
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>
2012-11-15 02:44:03 +01:00
caa2fa2c69
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>
2012-11-15 02:17:26 +01:00
a3cb7f992f
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>
2012-11-15 00:56:54 +01:00
12eb2fd539
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>
2012-11-15 00:43:30 +01:00
e70144cba1
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>
2012-11-14 23:54:00 +01:00
b74dbdd5e9
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>
2012-11-14 23:03:36 +01:00
612ecfbbbb
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>
2012-11-14 23:00:11 +01:00
50f0a6b4e6
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>
2012-11-14 21:15:08 +01:00
3b4296f414
avformat: clarify stream id for muxing
2012-11-14 20:38:51 +01:00
8034130e06
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>
2012-11-14 20:38:51 +01:00
30bce34b67
vpriv_adx_decode_header: avoid underreading the array.
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-14 19:16:08 +01:00
ab8517b891
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>
2012-11-14 19:16:08 +01:00
dbc44667ce
Add missing dependency for avr demuxer
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-11-14 18:02:28 +00:00
ccce723c6d
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>
2012-11-14 17:35:01 +01:00
a3138ebfa8
fate: Add dependencies for aac, alac, amrnb, amrwb, atrac tests
2012-11-14 15:09:59 +01:00
7f1fcaf0e6
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>
2012-11-14 13:50:43 +00:00
7ba0c1b390
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>
2012-11-14 13:50:42 +00:00
87d073eacc
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>
2012-11-14 14:08:44 +01:00
a1b5c9634e
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>
2012-11-14 12:34:30 +01:00
b0c543b1de
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>
2012-11-14 12:31:28 +01:00
d4e74d5d6d
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>
2012-11-14 12:04:39 +01:00
e13d5e9a4b
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>
2012-11-14 11:59:20 +01:00
e8769b37fe
segment: fix NULL pointer dereference in seg_write_header()
...
Since the pointer `oc' is NULL, oc->oformat->name will cause a null
pointer dereference. This patch changes it to seg->oformat->name.
Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-11-14 12:33:27 +02:00
26afdbcfc0
ffserver: fix NULL dereference with quoted Stream name.
2012-11-14 10:09:57 +01:00
a9ba9268d7
ffserver: prefer av_asprintf over malloc+snprintf for Launch setting.
2012-11-14 10:09:51 +01:00
66ff90f4a3
8bps: check index against buffer size before reading line length pointer.
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-14 03:34:01 +01:00
7acee6654c
mpeg12data: increase size of ff_mpeg1_default_intra_matrix to prevent harmless overreads from crashing
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-14 03:17:52 +01:00
e1631f8ebe
aasc: check before reading the first 4 byte, fix overread
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-14 03:03:35 +01:00
39c5cd601e
vmnc: check input size before reading chunk header, fix overread
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-14 02:51:38 +01:00
b61658829b
Merge remote-tracking branch 'lippit/master'
...
* lippit/master:
Update iec61883 to handle multiple devices, and allow selection of DV device by its GUID
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-14 02:24:17 +01:00
9f088712d4
ffmpeg: fix double ;;
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-14 02:06:50 +01:00
Clément Bœsch
Michael Niedermayer
Paul B Mahol
Carl Eugen Hoyos
Clément Bœsch
Xi Wang
Luca Barbato
Diego Biurrun
Mans Rullgard