Michael Niedermayer
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>
12 years ago
Michael Niedermayer
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>
12 years ago
Michael Niedermayer
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>
12 years ago
Michael Niedermayer
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>
12 years ago
Michael Niedermayer
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>
12 years ago
Xi Wang
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>
12 years ago
Clément Bœsch
26afdbcfc0
ffserver: fix NULL dereference with quoted Stream name.
12 years ago
Clément Bœsch
a9ba9268d7
ffserver: prefer av_asprintf over malloc+snprintf for Launch setting.
12 years ago
Michael Niedermayer
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>
12 years ago
Michael Niedermayer
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>
12 years ago
Michael Niedermayer
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>
12 years ago
Michael Niedermayer
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>
12 years ago
Michael Niedermayer
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>
12 years ago
Michael Niedermayer
9f088712d4
ffmpeg: fix double ;;
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
9406d6be55
ffmpeg: fix audio timestamps on stream copy with -ss
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Diego Biurrun
26301caaa1
x86: mmx2 ---> mmxext in asm constructs
12 years ago
Diego Biurrun
da39cac8de
Drop broken and unused CABAC test program.
12 years ago
Michael Niedermayer
2f74f8d7dc
imc: sanity check scalefactors.
...
This fixes undefined behavior
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
1f1960519a
lxfdec: fix "no audio stream" check. avoid null ptrs deref
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Stefano Sabatini
334a0d15c6
lavfi/frei0r: add additional trailing slash in FREI0R_PATH paths
...
Allow to accept paths with no ending trailing slash.
Based on a patch by rogerdpack <rogerpack2005@gmail.com>.
12 years ago
Stefano Sabatini
9a2028d4f4
lavfi/frei0r: correctly handle paths longer than 1023 chars
12 years ago
Michael Niedermayer
af9ec3dd1d
av_probe_input_format3: support NULL as buffer. Fixes null ptr deref
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
001af703c6
alac: check channel count more completely, fix out of array read
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
b119133136
avrndec: calculate true_height only when used.
...
Fixes division by 0
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
7373b3ad04
pcmdec: consistently use codec_id, fixes out of array reads
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
eab022d863
mpegts: prevent freeing ones own section in pat_cb
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
4392e69ad4
mov: check stps correctly, avoid overreading 1 element.
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
3669915e93
dvdec: check ipcm more completely, avoid assert failure.
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Clément Bœsch
41ebbb3b04
lavf/wtvenc: fix s[tp]_pairs memleak.
12 years ago
Georg Lippitsch
15b02ddee0
Update iec61883 to handle multiple devices, and allow
...
selection of DV device by its GUID
12 years ago
Michael Niedermayer
7c76eaeca2
mpeg4video_parser: init static tables before use, fix nulll ptr deref
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
1bd024ec77
mpeg4videodec: split static decoder table init out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Diego Biurrun
5e9c6ef8f3
x86: h264_weight_10bit: port to cpuflags
12 years ago
Michael Niedermayer
c74cd99986
rv10: consider B frames in low delay streams invalid.
...
Fix assertion failure
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Luca Barbato
83f9ed42ec
libtheoraenc: add missing pixdesc.h header
...
Was left out from c1a02e884a
.
12 years ago
Michael Niedermayer
a0212ecf84
dcadec: check layout & channel count for consistency.
...
Fixes out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Luca Barbato
cc085993f4
avcodec: remove ff_is_hwaccel_pix_fmt
...
It is used only in one place and is unlikely it would be needed
elsewhere.
12 years ago
Luca Barbato
c1a02e884a
pixdesc: add av_pix_fmt_get_chroma_sub_sample
...
Deprecate avcodec_get_chroma_sub_sample.
12 years ago
Michael Niedermayer
4facddd568
mpegts: dont set stream info when a decoder has already been opened.
...
Fixes assertion failure.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
327cd0d09b
mpegts: prevent freeing ones own section in pmt_cb
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Paul B Mahol
09a0392341
paf: set channel layout
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Paul B Mahol
1acd2f6ba7
Replace rest of libavutil/audioconvert.h with libavutil/channel_layout.h
...
Also remove it in once case when it is not needed.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Michael Niedermayer
e97a24109c
avcodec.h: update audioconvert.h header after rename
...
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Stefano Sabatini
7945665200
lavfi: store and propagate number of channels information in audio buffer properties
...
The channels field is required since the channel layout is not always
available.
12 years ago
Stefano Sabatini
9d2a7c0481
doc/encoders: document libtheora encoder
12 years ago
Stefano Sabatini
8cb76ef275
lavc/libtheoraenc: return proper error codes
12 years ago
Michael Niedermayer
799d749c77
Merge remote-tracking branch 'qatar/master'
...
* qatar/master: (24 commits)
yop: set channel layout
wtv: set channel layout for mpeg audio
westwood_aud: set channel layout
wc3movie: set channel layout
tmv: set channel layout
tiertexseq: set channel layout
swfdec: set channel layout
sol: set channel layout
smacker: set channel layout
siff: set channel layout
sierravmd: set channel layout
rtpdec_amr: set channel layout
rsodec: set channel layout
rmdec: set channel layout for RA version 3
qcp: set channel layout
psxstr: set channel layout
omadec: set channel layout
oggparsespeex: validate channel count and set channel layout
nuv: set channel layout
mxg: set channel layout
...
Conflicts:
libavformat/swfdec.c
libavformat/wtv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
7eb40d85f2
Merge commit 'ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b'
...
* commit 'ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b': (21 commits)
jvdec: set channel layout
iss: set channel layout
ipmovie: set channel layout
iff: set channel layout
idroqdec: set channel layout
gxfdec: set channel layout when applicable
gsmdec: set channel layout
flvdec: set channel layout
dv: set channel layout
dsicin: set channel layout
daud: set channel layout
cdxl: set channel layout
bmv: set channel layout
bink: set channel layout
bfi: set channel layout
bethsoftvid: set channel layout
apc: set channel layout
amr: set channel_layout
ppc: replace pointer casting with AV_COPY32
ppc: fix some unused variable warnings
...
Conflicts:
libavformat/amr.c
libavformat/iff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
a8f2420e06
remove tests/asynth1.sw
...
This file appears to have been commited by 100l mistake.
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Clément Bœsch
f6f52936be
fate/avfilter: honor GPL dependency.
12 years ago