Michael Niedermayer
f02033b98b
Merge commit 'f713411d4cfbd9c467aeda77b16ca6bc4db55d10'
...
* commit 'f713411d4cfbd9c467aeda77b16ca6bc4db55d10':
mdec: cosmetics, reformat
Conflicts:
libavcodec/mdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
14aa358c20
Merge commit '098eed95bc1a6b2c8ac97f126f62bb74699670cf'
...
* commit '098eed95bc1a6b2c8ac97f126f62bb74699670cf':
mdec: merge mdec_common_init() into decode_init().
eatgv: use fixed-width types where appropriate.
x86: Simplify some arch conditionals
bfin: Separate VP3 initialization code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
8265c0f43a
Merge commit 'f550583c00e231b587d8ef98451cfbb6b6561eb6'
...
* commit 'f550583c00e231b587d8ef98451cfbb6b6561eb6':
bfin: update VP3 idct
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Paul B Mahol
8a6ae87b99
lavc: move deprecated audio_resample* bellow
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Anton Khirnov
7194330bcd
vf_delogo: fix copying the input frame.
...
CC:libav-stable@libav.org
12 years ago
Anton Khirnov
f81c37e40f
vf_delogo: fix an uninitialized read.
...
CC:libav-stable@libav.org
12 years ago
Anton Khirnov
76e74e4831
h264: remove obsolete comment.
12 years ago
Anton Khirnov
47318953dd
mpegvideo: remove some unused variables from Picture.
12 years ago
Anton Khirnov
231fd1ed39
utvideoenc/v410enc: do not set AVFrame.reference.
...
That field will be deprecated.
12 years ago
Anton Khirnov
e6b1c3bbe7
pthread: make ff_thread_release_buffer idempotent.
...
I.e. don't do anything on already released frames.
12 years ago
Anton Khirnov
729b37149c
mvi: set framerate
...
This container does not store timestamps and thus supports CFR only.
12 years ago
Anton Khirnov
aec50f79e7
rawdec: use AVPALETTE_SIZE instead of magic constants.
12 years ago
Anton Khirnov
e6da5d215b
mimic: remove a pointless cast.
12 years ago
Anton Khirnov
30d62507cd
mdec: return meaningful error codes.
12 years ago
Anton Khirnov
f713411d4c
mdec: cosmetics, reformat
12 years ago
Anton Khirnov
098eed95bc
mdec: merge mdec_common_init() into decode_init().
...
There is no point in keeping those two functions separate.
12 years ago
Anton Khirnov
f1c395944c
eatgv: use fixed-width types where appropriate.
12 years ago
Michael Niedermayer
11c99c78ba
h264: check the pixel format directly and force a reinit on mismatches.
...
The existing checks are insufficient to detect a pixel format
changes in case of some damaged streams.
Fixes inconsistency and later out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Piotr Bandurski
f9a8eeb08c
iff/deep: fix rle32 on big-endian
...
Fixes ticket #2197 .
Signed-off-by: Peter Ross <pross@xvid.org>
12 years ago
Diego Biurrun
c59211b437
x86: Simplify some arch conditionals
12 years ago
Paul B Mahol
9efceaf1f7
takdec: switch to init_get_bits8()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Michael Niedermayer
3939b790f2
wmavoicedec: use the checked bitstream, reader
...
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
14c8ee00ff
vp3dec: move threads check out of header packet type check
...
Prevents reconfiguration with threads which is unsupported
and would bring the contexts into an inconsistent state.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
1336382c6d
avfilter_get_audio_buffer_ref_from_frame: fix handling of >8 channels
...
Found-by: inferno@chromium.org
Reported-by: Dale Curtis <dalecurtis@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Diego Biurrun
438ea561ad
bfin: Separate VP3 initialization code
12 years ago
Luca Barbato
f550583c00
bfin: update VP3 idct
...
The block must be set to 0.
12 years ago
Michael Niedermayer
94ef1667bb
dirac/x86: Fix handling blocksizes that are not a multiple of 4
...
Fixes out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
5c9cae7447
dirac: Only use MMX if MMX is available.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
8c4aebb58d
qdm2: increase noise_table size
...
This prevents out of array reads. An alternative solution would be
to check the index but this would require several checks in the
inner loops
Yet another alternative would be to change the index reset logic
but this likely would introduce a difference to the binary decoder
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
4484c722f6
alsdec/read_specific_config: check for init_get_bits failure
...
This also fixes a potential integer overflow
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Thilo Borgmann <thilo.borgmann@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
1146bbc5a6
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
x86: hpeldsp: Fix a typo, use the right register
shorten: fix array subscript is below array bounds warning
Conflicts:
libavcodec/shorten.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
bb2f4ae434
Merge commit '05b0998f511ffa699407465d48c7d5805f746ad2'
...
* commit '05b0998f511ffa699407465d48c7d5805f746ad2':
dsputil: Fix error by not using redzone and register name
swscale: GBRP output support
Conflicts:
libswscale/output.c
libswscale/swscale.c
libswscale/swscale_internal.h
libswscale/utils.c
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Piotr Bandurski
51e9d2dbc8
aasc: fix 16bpp on big-endian
12 years ago
Michael Niedermayer
834e9fb056
x86: hpeldsp: Fix a typo, use the right register
...
This makes the code actually work.
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years ago
Luca Barbato
4839fbe2d1
shorten: fix array subscript is below array bounds warning
...
Incidentally fixes alpha builds.
12 years ago
Daniel Kang
05b0998f51
dsputil: Fix error by not using redzone and register name
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
12 years ago
Stephan Hilb
0501d06468
lavd/v4l2: use avcodec_find_decoder in list_formats
...
Because libavdevice/v4l2 is a demuxer, it makes sense to look for
decoders instead of encoders when listing the formats supported by the
device.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
12 years ago
Michael Niedermayer
4ade824e1f
mjpegdec: rgb mode is specific for ljpeg, disable it for others.
...
Fixes null pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
73abc3a634
aacdec: check init_get_bits return
...
Also fixes an integer overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
8888c72fcf
mjpegdec: fix memcmp size for *_count
...
Fixes assertion failure
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Carl Eugen Hoyos
d88d0b6db6
Write forced track flag to matroska files.
...
Based on a patch by Daniel Pielmeier, daniel pielmeier gmail
Fixes a part of ticket #1815 .
12 years ago
Carl Eugen Hoyos
a6a5101654
Fix some avi rawvideo formats on big endian.
...
Fixes ticket #2196 .
12 years ago
Michael Niedermayer
4eb93bed4e
swscale: GBRP output support
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
12 years ago
Michael Niedermayer
deefdf9788
avpriv_mpeg4audio_get_config: check init_get_bits() return code.
...
Fixes null pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
96f452ac64
aacdec: check channel count
...
Prevent out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Matthieu Bouron
9d602a0b0e
lavc/dnxhdenc: print valid profiles when codec parameters are invalid
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Matthieu Bouron
5b83b2da08
lavc/dnxhddata: add frame_rates field to cid table
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Giorgio Vazzana
93d319a582
lavd/v4l2: select input immediately after opening the device
...
After opening the device, the first thing we should do is selecting the
input. This is because the image formats (VIDIOC_ENUM_FMT ioctl) and the
standards (VIDIOC_ENUMSTD ioctl) supported may depend on the selected
input ([1] and [2]).
[1] http://linuxtv.org/downloads/v4l-dvb-apis/vidioc-enum-fmt.html
[2] http://linuxtv.org/downloads/v4l-dvb-apis/vidioc-enumstd.html
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
12 years ago
Stefano Sabatini
5306976be8
lavd/v4l2: sanitize logic of device_try_init(), so that it properly signal errors
...
Make device_try_init() return an error value, and allow to properly
report errors which are not due to a wrong pixel/codec configuration.
In particular, report intelligible feedback in case of busy device.
12 years ago
Stefano Sabatini
27db2bf000
ffmpeg: remove -crop* and -pad* options
...
The options have been deprecated and are non-operational since more than
two years.
12 years ago