]> git.sesse.net Git - ffmpeg/log
ffmpeg
11 years agoadpcm: reindent after previous commit
Paul B Mahol [Wed, 7 Nov 2012 18:07:39 +0000 (18:07 +0000)]
adpcm: reindent after previous commit

Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years agoadpcm: ADPCM IMA SMJPEG stereo decoding
Paul B Mahol [Wed, 7 Nov 2012 16:55:26 +0000 (16:55 +0000)]
adpcm: ADPCM IMA SMJPEG stereo decoding

Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years agoanm: return meaningful error codes
Paul B Mahol [Sun, 11 Nov 2012 11:00:11 +0000 (11:00 +0000)]
anm: return meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 12 Nov 2012 11:18:53 +0000 (12:18 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  binkaudio: set channel layout

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge commit '2b479bcab0a8365a7c094c5fa44b8cb6da9810d0'
Michael Niedermayer [Mon, 12 Nov 2012 11:04:31 +0000 (12:04 +0100)]
Merge commit '2b479bcab0a8365a7c094c5fa44b8cb6da9810d0'

These patches have not been merged at the request of Carl

* commit '2b479bcab0a8365a7c094c5fa44b8cb6da9810d0':
  build: Drop AVX assembly ifdefs
  x86: Require an assembler able to cope with AVX instructions

Conflicts:
libavcodec/x86/fft.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'
Michael Niedermayer [Mon, 12 Nov 2012 10:32:11 +0000 (11:32 +0100)]
Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'

* commit '97bf7c03b1338a867da52c159a2afecbdedcfa88':
  doc: git-howto: Leave reviewers time to react before pushing patches
  Include libavutil/channel_layout.h instead of libavutil/audioconvert.h
  lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h

Conflicts:
doc/APIchanges
doc/examples/decoding_encoding.c
doc/git-howto.texi
ffmpeg_filter.c
libavcodec/flacdec.c
libavcodec/imc.c
libavcodec/mpegaudiodec.c
libavcodec/utils.c
libavfilter/asrc_anullsrc.c
libavfilter/audio.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/buffer.c
libavutil/Makefile
libavutil/audioconvert.h
libavutil/channel_layout.c
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge commit '802713c4e7b41bc2deed754d78649945c3442063'
Michael Niedermayer [Mon, 12 Nov 2012 09:57:06 +0000 (10:57 +0100)]
Merge commit '802713c4e7b41bc2deed754d78649945c3442063'

* commit '802713c4e7b41bc2deed754d78649945c3442063':
  mss2: prevent potential uninitialized reads
  mss2: reindent after last commit
  mss2: fix handling of unmasked implicit WMV9 rectangles
  configure: add lavu dependency to lavr/lavfi .pc files
  x86inc: Set program_name outside of x86inc.asm

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agobinkaudio: set channel layout
Justin Ruggles [Sat, 7 Apr 2012 16:10:59 +0000 (12:10 -0400)]
binkaudio: set channel layout

11 years agovc1dec: prevent null ptr dereferences.
Michael Niedermayer [Mon, 12 Nov 2012 00:39:13 +0000 (01:39 +0100)]
vc1dec: prevent null ptr dereferences.

The added checks are in line with existing checks but should
probably be replaced by more advanced error concealment at some
point.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agovc1dec: factorize srcU/V offseting out
Michael Niedermayer [Mon, 12 Nov 2012 00:34:44 +0000 (01:34 +0100)]
vc1dec: factorize srcU/V offseting out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agovc1: check image height, fix division by 0
Michael Niedermayer [Mon, 12 Nov 2012 00:22:31 +0000 (01:22 +0100)]
vc1: check image height, fix division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agompeg12: clean current picture ptr.
Michael Niedermayer [Sun, 11 Nov 2012 22:24:54 +0000 (23:24 +0100)]
mpeg12: clean current picture ptr.

This avoids having a stray pointer left that may not represent the current picture
and state.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agolavfi: remove mp=geq filter.
Clément Bœsch [Sun, 11 Nov 2012 22:18:03 +0000 (23:18 +0100)]
lavfi: remove mp=geq filter.

Native geq video filter is now available.

11 years agolavfi: add geq filter.
Clément Bœsch [Mon, 14 May 2012 17:03:19 +0000 (19:03 +0200)]
lavfi: add geq filter.

11 years agolavf/assenc: add non strict ts flag.
Clément Bœsch [Sat, 10 Nov 2012 23:12:05 +0000 (00:12 +0100)]
lavf/assenc: add non strict ts flag.

ASS can have several events at the same time.

11 years agolavfi: remove mp=fixpts filter.
Clément Bœsch [Thu, 8 Nov 2012 23:15:41 +0000 (00:15 +0100)]
lavfi: remove mp=fixpts filter.

lavfi/f_setpts.c should allow everything mp=fixpts supports, with a lot
of additional control.

11 years agolavfi: remove mp=tile filter.
Clément Bœsch [Thu, 8 Nov 2012 22:42:38 +0000 (23:42 +0100)]
lavfi: remove mp=tile filter.

The native tile video filter is now feature equivalent.

11 years agofate/lavfi: increase vf tile coverage.
Clément Bœsch [Thu, 8 Nov 2012 22:31:43 +0000 (23:31 +0100)]
fate/lavfi: increase vf tile coverage.

11 years agodoc/filters: complete tile documentation.
Clément Bœsch [Thu, 8 Nov 2012 22:30:25 +0000 (23:30 +0100)]
doc/filters: complete tile documentation.

11 years agolavfi/tile: extend shorthand parameters.
Clément Bœsch [Thu, 8 Nov 2012 22:17:37 +0000 (23:17 +0100)]
lavfi/tile: extend shorthand parameters.

This makes the syntax similar to mp=tile.

11 years agolavfi/tile: add nb_frames option.
Clément Bœsch [Thu, 8 Nov 2012 22:12:43 +0000 (23:12 +0100)]
lavfi/tile: add nb_frames option.

11 years agolavfi/tile: add margin and padding options.
Clément Bœsch [Sun, 11 Nov 2012 21:37:20 +0000 (22:37 +0100)]
lavfi/tile: add margin and padding options.

11 years agolavfi/tile: allow named arguments.
Clément Bœsch [Sun, 11 Nov 2012 21:36:26 +0000 (22:36 +0100)]
lavfi/tile: allow named arguments.

11 years agogxf: avoid null ptr deref without streams.
Michael Niedermayer [Sun, 11 Nov 2012 19:57:45 +0000 (20:57 +0100)]
gxf: avoid null ptr deref without streams.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoproresdec: check input size before reading qmats, prevent overreading.
Michael Niedermayer [Sun, 11 Nov 2012 19:51:30 +0000 (20:51 +0100)]
proresdec: check input size before reading qmats, prevent overreading.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agobuild: Drop AVX assembly ifdefs
Diego Biurrun [Fri, 19 Oct 2012 17:04:40 +0000 (19:04 +0200)]
build: Drop AVX assembly ifdefs

An assembler able to cope with AVX instructions is now required.

11 years agodoc: git-howto: Leave reviewers time to react before pushing patches
Diego Biurrun [Thu, 25 Oct 2012 16:33:38 +0000 (18:33 +0200)]
doc: git-howto: Leave reviewers time to react before pushing patches

11 years agox86: Require an assembler able to cope with AVX instructions
Diego Biurrun [Fri, 28 Sep 2012 17:36:53 +0000 (19:36 +0200)]
x86: Require an assembler able to cope with AVX instructions

All modern assemblers have this capability.  Older NASM versions
that lack the capability produce code that crashes at runtime,
so it's better to error out during the build process instead.

CC: libav-stable@libav.org
11 years agodsicinav: update bitmap_frame_size, avoid out of array reads.
Michael Niedermayer [Sun, 11 Nov 2012 18:46:16 +0000 (19:46 +0100)]
dsicinav: update bitmap_frame_size, avoid out of array reads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoInclude libavutil/channel_layout.h instead of libavutil/audioconvert.h
Justin Ruggles [Sat, 10 Nov 2012 15:00:00 +0000 (10:00 -0500)]
Include libavutil/channel_layout.h instead of libavutil/audioconvert.h

Also reorder some other #include when applicable.

11 years agolavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h
Justin Ruggles [Sat, 10 Nov 2012 14:03:17 +0000 (09:03 -0500)]
lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h

11 years agosnow: fix edge emu switch
Michael Niedermayer [Sun, 11 Nov 2012 18:02:05 +0000 (19:02 +0100)]
snow: fix edge emu switch

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agomsmpeg4dec: check w/h, prevent assert failure later
Michael Niedermayer [Sun, 11 Nov 2012 17:45:56 +0000 (18:45 +0100)]
msmpeg4dec: check w/h, prevent assert failure later

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agosegafilm: fix division by 0
Michael Niedermayer [Sun, 11 Nov 2012 17:32:26 +0000 (18:32 +0100)]
segafilm: fix division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoomadec: fix len check in nprobe() prevent out of array access
Michael Niedermayer [Sun, 11 Nov 2012 17:16:24 +0000 (18:16 +0100)]
omadec: fix len check in nprobe() prevent out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agozmbvdec: check decompression buffer size.
Michael Niedermayer [Sun, 11 Nov 2012 17:08:39 +0000 (18:08 +0100)]
zmbvdec: check decompression buffer size.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agodiracdec: check wavelet depth, prevent out of array read.
Michael Niedermayer [Sun, 11 Nov 2012 16:20:10 +0000 (17:20 +0100)]
diracdec: check wavelet depth, prevent out of array read.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agolibvorbisdec: dont try to update an empty que
Michael Niedermayer [Sun, 11 Nov 2012 15:38:00 +0000 (16:38 +0100)]
libvorbisdec: dont try to update an empty que

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agodiracdec: Use only one frame per reference
Michael Niedermayer [Sun, 11 Nov 2012 15:36:27 +0000 (16:36 +0100)]
diracdec: Use only one frame per reference

Prevents null ptr dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agomss2: prevent potential uninitialized reads
Alberto Delmás [Sun, 11 Nov 2012 08:47:39 +0000 (09:47 +0100)]
mss2: prevent potential uninitialized reads

The alternative to zeroing on init is setting the corrupted flag in
all cases where pal_pic is not fully written, at the cost of added
complexity.

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
11 years agomss2: reindent after last commit
Kostya Shishkov [Sun, 11 Nov 2012 14:00:38 +0000 (15:00 +0100)]
mss2: reindent after last commit

11 years agomss2: fix handling of unmasked implicit WMV9 rectangles
Alberto Delmás [Sun, 11 Nov 2012 08:23:06 +0000 (09:23 +0100)]
mss2: fix handling of unmasked implicit WMV9 rectangles

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
11 years agoconfigure: add lavu dependency to lavr/lavfi .pc files
Anton Khirnov [Sat, 3 Nov 2012 07:14:11 +0000 (08:14 +0100)]
configure: add lavu dependency to lavr/lavfi .pc files

11 years agodoc/Makefile: generate library headers with the correct section number
Stefano Sabatini [Sun, 11 Nov 2012 11:50:44 +0000 (12:50 +0100)]
doc/Makefile: generate library headers with the correct section number

11 years agoelectronic arts: support rare samples containing adpcm_ea_r1 audio
Peter Ross [Fri, 9 Nov 2012 23:27:36 +0000 (10:27 +1100)]
electronic arts: support rare samples containing adpcm_ea_r1 audio

Fixes ticket #1549.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoelectronicarts: use av_log_ask_for_sample
Peter Ross [Fri, 9 Nov 2012 23:23:00 +0000 (10:23 +1100)]
electronicarts: use av_log_ask_for_sample

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoh264: 2nd try at getting sm2v working
Michael Niedermayer [Sun, 11 Nov 2012 11:50:03 +0000 (12:50 +0100)]
h264: 2nd try at getting sm2v working

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agodwt_yasm/vertical_compose: fix width witdth argument.
Michael Niedermayer [Sun, 11 Nov 2012 11:40:38 +0000 (12:40 +0100)]
dwt_yasm/vertical_compose: fix width witdth argument.

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 11 Nov 2012 11:17:57 +0000 (12:17 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: h264_qpel_10bit: drop unused parameter from MC10/MC20/MC30 macros

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agodoc: add libavfilter.texi
Stefano Sabatini [Sun, 4 Nov 2012 11:12:56 +0000 (12:12 +0100)]
doc: add libavfilter.texi

With some re-wording by Alexander Strasser <eclipse7@gmx.net>.

11 years agodoc: add libavutil.texi
Stefano Sabatini [Sun, 4 Nov 2012 11:42:47 +0000 (12:42 +0100)]
doc: add libavutil.texi

With some fixes and better wording by Alexander Strasser
<eclipse7@gmx.net>.

11 years agox86inc: Set program_name outside of x86inc.asm
Diego Biurrun [Tue, 30 Oct 2012 02:21:48 +0000 (03:21 +0100)]
x86inc: Set program_name outside of x86inc.asm

This reduces the local difference to the x264 upstream version.

11 years agosmackaud: return meaningful error codes
Paul B Mahol [Sun, 11 Nov 2012 10:04:04 +0000 (10:04 +0000)]
smackaud: return meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years agotarga: return more meaningful error codes
Paul B Mahol [Sun, 11 Nov 2012 09:44:36 +0000 (09:44 +0000)]
targa: return more meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years agodiracdec: allocate enough space for blocks
Michael Niedermayer [Sun, 11 Nov 2012 02:35:10 +0000 (03:35 +0100)]
diracdec: allocate enough space for blocks

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agodiracdec: fix edge emulation check, fixes out of array reads
Michael Niedermayer [Sun, 11 Nov 2012 02:34:09 +0000 (03:34 +0100)]
diracdec: fix edge emulation check, fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoh264: Support SMV2
Michael Niedermayer [Sun, 11 Nov 2012 01:48:06 +0000 (02:48 +0100)]
h264: Support SMV2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoh264_refs: Print default in case we are missing a reference.
Michael Niedermayer [Sun, 11 Nov 2012 01:47:38 +0000 (02:47 +0100)]
h264_refs: Print default in case we are missing a reference.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agomxfdec: avoid double free and leaks.
Michael Niedermayer [Sun, 11 Nov 2012 01:13:31 +0000 (02:13 +0100)]
mxfdec: avoid double free and leaks.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agomatroskadec: check h in generic rm packet shuffler
Michael Niedermayer [Sun, 11 Nov 2012 00:00:04 +0000 (01:00 +0100)]
matroskadec: check h in generic rm packet shuffler

Fixes crash

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agomjpegdec: check SE.
Michael Niedermayer [Sat, 10 Nov 2012 23:01:24 +0000 (00:01 +0100)]
mjpegdec: check SE.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agolavf/srtenc: ignore invalid timed packets instead of failing.
Clément Bœsch [Wed, 24 Oct 2012 22:27:10 +0000 (00:27 +0200)]
lavf/srtenc: ignore invalid timed packets instead of failing.

This way we don't abort in the middle of remuxing, just warn about an
event ignored. The index increment is moved to make sure the output
numbers still make sense.

11 years agoalac: fix bps check
Michael Niedermayer [Sat, 10 Nov 2012 20:54:30 +0000 (21:54 +0100)]
alac: fix bps check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agolavfi/avcodec: check that injected avframes use a supported channel layout
Michael Niedermayer [Sat, 10 Nov 2012 20:44:20 +0000 (21:44 +0100)]
lavfi/avcodec: check that injected avframes use a supported channel layout

This fixes out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agolavfi/avcodec: check avfilter_copy_frame_props() return code
Michael Niedermayer [Sat, 10 Nov 2012 19:54:25 +0000 (20:54 +0100)]
lavfi/avcodec: check avfilter_copy_frame_props() return code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agomips: Add dependencies on HAVE_INLINE_ASM
Nedeljko Babic [Fri, 9 Nov 2012 11:45:40 +0000 (12:45 +0100)]
mips: Add dependencies on HAVE_INLINE_ASM

Add dependencies on HAVE_INLINE_ASM for files and parts of code
 where it is necessary.

Signed-off-by: Nedeljko Babic <nbabic@mips.com>
Reviewed-by: Vitor Sessak <vitor1001@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agolag_read_prob_header: fix out of array access
Michael Niedermayer [Sat, 10 Nov 2012 18:38:44 +0000 (19:38 +0100)]
lag_read_prob_header: fix out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoalac: Check channel indexes more completely, fix out of array accesses.
Michael Niedermayer [Sat, 10 Nov 2012 17:21:50 +0000 (18:21 +0100)]
alac: Check channel indexes more completely, fix out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoalac: fix integer overflow leading to subsequent out of array accesses.
Michael Niedermayer [Sat, 10 Nov 2012 16:41:56 +0000 (17:41 +0100)]
alac: fix integer overflow leading to subsequent out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoalac: fix nb_samples < order case
Michael Niedermayer [Sat, 10 Nov 2012 16:14:04 +0000 (17:14 +0100)]
alac: fix nb_samples < order case

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agox86: h264_qpel_10bit: drop unused parameter from MC10/MC20/MC30 macros
Diego Biurrun [Sat, 28 Jul 2012 02:02:09 +0000 (04:02 +0200)]
x86: h264_qpel_10bit: drop unused parameter from MC10/MC20/MC30 macros

11 years agomov: Make sure no streams after the header lack a timescale.
Michael Niedermayer [Sat, 10 Nov 2012 12:28:26 +0000 (13:28 +0100)]
mov: Make sure no streams after the header lack a timescale.

Fixes division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoriff: add SMV2 FourCC for H264
Piotr Bandurski [Sat, 10 Nov 2012 01:11:49 +0000 (02:11 +0100)]
riff: add SMV2 FourCC for H264

sample:

http://samples.mplayerhq.hu/V-codecs/smv2.avi

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 10 Nov 2012 11:44:27 +0000 (12:44 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: PALIGNR: port to cpuflags
  x86: h264_qpel_10bit: port to cpuflags

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoAllow forcing a frame size in bytes for image2pipe.
Carl Eugen Hoyos [Sat, 10 Nov 2012 01:25:17 +0000 (02:25 +0100)]
Allow forcing a frame size in bytes for image2pipe.

This allows decoding of concatenated frames encoded in
uncompressed formats like v210.
The frame size cannot be generally calculated, FFmpeg
also supports broken encoders.

Fixes ticket #1869.

11 years agoAdd yuv4xxp12 and yuv4xxp14 pixel formats to y4m encoder and decoder.
Carl Eugen Hoyos [Sat, 10 Nov 2012 01:19:55 +0000 (02:19 +0100)]
Add yuv4xxp12 and yuv4xxp14 pixel formats to y4m encoder and decoder.

Reviewed-by: Paul B Mahol
11 years agopictordec: fill any unset portion of the image
Peter Ross [Fri, 9 Nov 2012 23:31:14 +0000 (10:31 +1100)]
pictordec: fill any unset portion of the image

Fixes ticket #1710

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoriff: add GXVE FourCC for WMV2
Piotr Bandurski [Fri, 9 Nov 2012 23:24:09 +0000 (00:24 +0100)]
riff: add GXVE FourCC for WMV2

sample:

http://samples.mplayerhq.hu/V-codecs/ViVD/vivd.avi

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoivi_common: check ref_tile size, fix out of array accesses
Michael Niedermayer [Sat, 10 Nov 2012 00:51:40 +0000 (01:51 +0100)]
ivi_common: check ref_tile size, fix out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoivi_common: more MV Checks, fixes out of array reads
Michael Niedermayer [Fri, 9 Nov 2012 22:38:51 +0000 (23:38 +0100)]
ivi_common: more MV Checks, fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoebml_read_binary: use fast_padded_malloc()
Michael Niedermayer [Fri, 9 Nov 2012 21:58:10 +0000 (22:58 +0100)]
ebml_read_binary: use fast_padded_malloc()

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agox86: PALIGNR: port to cpuflags
Diego Biurrun [Sat, 7 Jul 2012 23:30:30 +0000 (01:30 +0200)]
x86: PALIGNR: port to cpuflags

11 years agotwinvq: make ibps check unsigned
Michael Niedermayer [Fri, 9 Nov 2012 20:22:12 +0000 (21:22 +0100)]
twinvq: make ibps check unsigned

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agox86: h264_qpel_10bit: port to cpuflags
Diego Biurrun [Mon, 30 Jul 2012 15:04:26 +0000 (17:04 +0200)]
x86: h264_qpel_10bit: port to cpuflags

11 years agoiff/ilbm: check remaining buffer size.
Michael Niedermayer [Fri, 9 Nov 2012 19:58:57 +0000 (20:58 +0100)]
iff/ilbm: check remaining buffer size.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agopcmdec: check that channels is valid.
Michael Niedermayer [Fri, 9 Nov 2012 19:47:54 +0000 (20:47 +0100)]
pcmdec: check that channels is valid.

Prevents a division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoaacdec: fix temporary array size
Michael Niedermayer [Fri, 9 Nov 2012 19:33:01 +0000 (20:33 +0100)]
aacdec: fix temporary array size

Avoids out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agopngdec: check that format matches too not just dimensions
Michael Niedermayer [Fri, 9 Nov 2012 18:58:37 +0000 (19:58 +0100)]
pngdec: check that format matches too not just dimensions

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agotiffdec: check rps, fix infinite loop.
Michael Niedermayer [Fri, 9 Nov 2012 18:28:23 +0000 (19:28 +0100)]
tiffdec: check rps, fix infinite loop.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agotwinvq: check bitrate for validity avoid division by 0
Michael Niedermayer [Fri, 9 Nov 2012 17:45:41 +0000 (18:45 +0100)]
twinvq: check bitrate for validity avoid division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agovqf: check samplerate, avoid division by 0.
Michael Niedermayer [Fri, 9 Nov 2012 17:04:54 +0000 (18:04 +0100)]
vqf: check samplerate, avoid division by 0.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoiff: avoid out of array reads, due to too many planes.
Michael Niedermayer [Fri, 9 Nov 2012 16:47:51 +0000 (17:47 +0100)]
iff: avoid out of array reads, due to too many planes.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoxmv: Fix integer overflow
Michael Niedermayer [Fri, 9 Nov 2012 16:17:37 +0000 (17:17 +0100)]
xmv: Fix integer overflow

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agovp56dec: Fix handling of alpha configuration changes.
Michael Niedermayer [Fri, 9 Nov 2012 15:58:53 +0000 (16:58 +0100)]
vp56dec: Fix handling of alpha configuration changes.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agolavf: Dont compare absolute to relative timestamps in duration gcd
Michael Niedermayer [Fri, 9 Nov 2012 13:54:43 +0000 (14:54 +0100)]
lavf: Dont compare absolute to relative timestamps in duration gcd

This prevents a division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoivi_common: dont dereference null pointers.
Michael Niedermayer [Fri, 9 Nov 2012 13:17:17 +0000 (14:17 +0100)]
ivi_common: dont dereference null pointers.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoatrac3dec: Check coding mode against channels.
Michael Niedermayer [Fri, 9 Nov 2012 12:26:20 +0000 (13:26 +0100)]
atrac3dec: Check coding mode against channels.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoqdm2: check that coding_method is valid before using it.
Michael Niedermayer [Fri, 9 Nov 2012 12:13:50 +0000 (13:13 +0100)]
qdm2: check that coding_method is valid before using it.

Fixes out of array reads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agomjpegbdec: dont return a picture when there is no picture.
Michael Niedermayer [Fri, 9 Nov 2012 11:43:51 +0000 (12:43 +0100)]
mjpegbdec: dont return a picture when there is no picture.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agotiffdec: check count in metadata reading.
Michael Niedermayer [Fri, 9 Nov 2012 11:13:30 +0000 (12:13 +0100)]
tiffdec: check count in metadata reading.

Fixes out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>