OSDN Git Service
Giorgio Vazzana [Wed, 30 Jan 2013 14:08:04 +0000 (15:08 +0100)]
lavd/v4l2: read the correct time per frame from devices that support a standard
Generally speaking, there are two types of v4l2 devices [1]:
1) devices that support a standard, like PAL or NTFS (tv cards, for example). For
this class of devices the framerate is fixed by the standard (for example PAL uses
25 fps) and the v4l2 driver cannot usually negotiate a different framerate (unless
it can skip frames on the driver side, to save I/O bandwidth).
2) devices for which the notion of standard does not make sense (webcams, for example).
For these devices it is usually possibile to request a desidered framerate.
In either case, the desidered frame rate can be requested when the VIDIOC_G_PARM
ioctl returns the V4L2_CAP_TIMEPERFRAME flag in the capability field.
Currently the code does not check for V4L2_CAP_TIMEPERFRAME and supports only the
second category of devices, returning a time per frame of 0/0 for devices in the
first group that do not permit to negotiate the framerate.
This patch adds support to read the correct framerate in all cases.
[1] http://linuxtv.org/downloads/v4l-dvb-apis/standard.html
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Paul B Mahol [Thu, 31 Jan 2013 13:16:32 +0000 (13:16 +0000)]
lavfi/biquads: remove pointless casts
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 24 Jan 2013 17:20:05 +0000 (17:20 +0000)]
Port biquads filters from SoX
Adds allpass, bass, bandpass, bandreject, biquad,
equalizer, highpass, lowpass and treble filter.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Giorgio Vazzana [Wed, 30 Jan 2013 12:17:02 +0000 (13:17 +0100)]
lavd/v4l2: add list_standards option
Since the user is expected to choose the standard by name (with -standard
option), add the possibility to list all the supported standards.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Stefano Sabatini [Sat, 26 Jan 2013 14:25:39 +0000 (15:25 +0100)]
doc/eval: sort functions by name
Stefano Sabatini [Tue, 22 Jan 2013 22:53:39 +0000 (23:53 +0100)]
doc/eval: fix/extend documentation for taylor() function
Stefano Sabatini [Wed, 23 Jan 2013 10:45:31 +0000 (11:45 +0100)]
doc/eval: fix/extend documentation for root() function
Michael Niedermayer [Thu, 31 Jan 2013 03:20:24 +0000 (04:20 +0100)]
h264/cabac: check loop index
fix out of array read
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 31 Jan 2013 02:36:59 +0000 (03:36 +0100)]
asfdec: fix integer overflow in packet_replic_size check
Fixes assertion failure
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mirjana Vulin [Mon, 28 Jan 2013 16:47:53 +0000 (17:47 +0100)]
mips: optimization for float aac decoder (core module)
Signed-off-by: Mirjana Vulin <mvulin@mips.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 30 Jan 2013 23:45:24 +0000 (00:45 +0100)]
interplayvideo: Free previous frames on resolution changes.
Fixes out of array reads
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Piotr Bandurski [Wed, 30 Jan 2013 21:22:58 +0000 (22:22 +0100)]
loco: fix rgba on big-endian
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 30 Jan 2013 22:45:01 +0000 (23:45 +0100)]
flashsv: clear blocks array on reallocation
Fixes use of uninitialized data
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Tue, 29 Jan 2013 10:54:02 +0000 (10:54 +0000)]
auenc: strict check for supported codec
Also check number of streams and give error message why muxing failed.
This prevents muxing unsupported codec with known and supported tag.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 30 Jan 2013 22:10:33 +0000 (22:10 +0000)]
auenc: remove put_au_header() and merge its code into au_write_header
Such level of abstraction is pointless.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Wed, 30 Jan 2013 21:56:45 +0000 (22:56 +0100)]
wma: check byte_offset_bits
Fixes assertion failure
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 30 Jan 2013 18:58:25 +0000 (19:58 +0100)]
fixup_vorbis_headers: add missing malloc failure check
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paweł Hajdan, Jr [Thu, 10 Jan 2013 18:24:01 +0000 (10:24 -0800)]
oggparsevorbis: use av_realloc consistently
Memory passed to av_realloc cannot be allocated using memalign.
From realloc(3):
The realloc() function changes the size of the memory block pointed to
by ptr to size bytes. (...) Unless ptr is NULL, it must have been returned
by an earlier call to malloc(), calloc() or realloc().
The issue has been found by debugallocation, a part of google-perftools:
http://code.google.com/p/gperftools/ .
Signed-off-by: Paweł Hajdan, Jr <phajdan@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 30 Jan 2013 18:31:45 +0000 (19:31 +0100)]
dnxhddec: fix integer overflow / index check
Fixes out of array read
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 30 Jan 2013 17:12:42 +0000 (18:12 +0100)]
mss3: prevent AC state from becoming invalid in rac_normalise()
Fixes division by zero
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 30 Jan 2013 15:54:15 +0000 (16:54 +0100)]
avstring: fix "warning: return discards const qualifier from pointer target type"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 30 Jan 2013 15:41:33 +0000 (16:41 +0100)]
msrledec: merge switches
More speedup and fixes 'may be used uninitialized in this function' warnings
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 30 Jan 2013 15:39:35 +0000 (16:39 +0100)]
msrledec: move loop into switch
speeds up code and allows more simplifications
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 30 Jan 2013 15:33:45 +0000 (16:33 +0100)]
msrledec: move output pointer test up
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 30 Jan 2013 15:24:33 +0000 (16:24 +0100)]
mpegvideo_enc: factor expression out
Fixes "warning: dc[0..5] may be used uninitialized in this function"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 30 Jan 2013 13:49:12 +0000 (14:49 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
movenc: Simplify code by using avio_wb24
bfin: unbreak compilation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Tue, 29 Jan 2013 17:10:04 +0000 (19:10 +0200)]
movenc: Simplify code by using avio_wb24
Signed-off-by: Martin Storsjö <martin@martin.st>
Carl Eugen Hoyos [Wed, 30 Jan 2013 09:28:53 +0000 (10:28 +0100)]
Correctly mark non-default streams when muxing matroska.
Fixes ticket #1815.
Reviewed-by: Hendrik Leppkes
Michael Niedermayer [Wed, 30 Jan 2013 05:47:09 +0000 (06:47 +0100)]
dirac/x86: fix compile without yasm
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 30 Jan 2013 01:41:31 +0000 (02:41 +0100)]
dirac/x86: fix compile without inline asm
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Tue, 29 Jan 2013 23:49:16 +0000 (00:49 +0100)]
Fix 1bpp palettized png with width not a multiple of 8.
Fixes ticket #2204.
Michael Niedermayer [Tue, 29 Jan 2013 21:35:37 +0000 (22:35 +0100)]
sanm: Check MV before using them.
Fixes out of array reads
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paweł Hajdan, Jr [Tue, 29 Jan 2013 11:41:10 +0000 (11:41 +0000)]
dict.c: use av_mallocz instead of av_realloc
Memory passed to av_realloc must come from malloc,
calloc or realloc, and not e.g. memalign. realloc(3):
The realloc() function changes the size of the memory block pointed to
by ptr to size bytes. (...) Unless ptr is NULL, it must have been
returned by an earlier call to malloc(), calloc() or realloc().
The issue has been found by debugallocation, a part of google-perftools:
http://code.google.com/p/gperftools/ .
This makes fate pass when using LD_PRELOAD-ed debugallocation.
See also earlier discussion
http://ffmpeg.org/pipermail/ffmpeg-devel/2013-January/137234.html
Signed-off-by: Paweł Hajdan, Jr <phajdan@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 29 Jan 2013 18:10:07 +0000 (19:10 +0100)]
huffyuvdec: Skip len==0 cases
Fixes vlc decoding for hypothetical files that would contain such cases.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 29 Jan 2013 17:05:10 +0000 (18:05 +0100)]
huffyuvdec: check for and propagate failures from inside generate_joint_tables()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 29 Jan 2013 16:56:19 +0000 (17:56 +0100)]
huffyuvdec: Check init_vlc() return codes.
Prevents out of array writes
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 29 Jan 2013 16:13:45 +0000 (17:13 +0100)]
r3d: check that sampling rate is non negative.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 29 Jan 2013 15:57:22 +0000 (16:57 +0100)]
r3d: fix division by 0 with 0 sample rate
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 29 Jan 2013 15:33:32 +0000 (16:33 +0100)]
eval: fix 'warning: ignoring return value of strtod, declared with attribute warn_unused_result'
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 29 Jan 2013 15:15:02 +0000 (16:15 +0100)]
ac3enc: fix 'warning: block0 may be used uninitialized in this function'
The pointer is also initialized to NULL for safety.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 29 Jan 2013 14:57:15 +0000 (15:57 +0100)]
oggenc: fix "oggstream may be used uninitialized in this function" warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Tue, 29 Jan 2013 13:34:30 +0000 (14:34 +0100)]
bfin: unbreak compilation
Added a missing header file.
Michael Niedermayer [Tue, 29 Jan 2013 13:58:49 +0000 (14:58 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vf_delogo: fix copying the input frame.
Conflicts:
libavfilter/vf_delogo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 29 Jan 2013 13:25:17 +0000 (14:25 +0100)]
Merge commit '
f81c37e40fe3236d54da12aef9cdba48ba70ec31'
* commit '
f81c37e40fe3236d54da12aef9cdba48ba70ec31':
vf_delogo: fix an uninitialized read.
h264: remove obsolete comment.
mpegvideo: remove some unused variables from Picture.
utvideoenc/v410enc: do not set AVFrame.reference.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 29 Jan 2013 13:19:47 +0000 (14:19 +0100)]
Merge commit '
e6b1c3bbe7082c71ea8ee8ac83698c156c9e4838'
* commit '
e6b1c3bbe7082c71ea8ee8ac83698c156c9e4838':
pthread: make ff_thread_release_buffer idempotent.
mvi: set framerate
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 29 Jan 2013 13:10:11 +0000 (14:10 +0100)]
Merge commit '
aec50f79e7460340a148a3096fe212d67edc2c64'
* commit '
aec50f79e7460340a148a3096fe212d67edc2c64':
rawdec: use AVPALETTE_SIZE instead of magic constants.
mimic: remove a pointless cast.
mdec: return meaningful error codes.
Conflicts:
libavcodec/rawdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 29 Jan 2013 12:57:57 +0000 (13:57 +0100)]
Merge commit '
f713411d4cfbd9c467aeda77b16ca6bc4db55d10'
* commit '
f713411d4cfbd9c467aeda77b16ca6bc4db55d10':
mdec: cosmetics, reformat
Conflicts:
libavcodec/mdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 29 Jan 2013 12:48:26 +0000 (13:48 +0100)]
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>
Michael Niedermayer [Tue, 29 Jan 2013 12:40:36 +0000 (13:40 +0100)]
Merge commit '
f550583c00e231b587d8ef98451cfbb6b6561eb6'
* commit '
f550583c00e231b587d8ef98451cfbb6b6561eb6':
bfin: update VP3 idct
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Mon, 28 Jan 2013 22:59:15 +0000 (22:59 +0000)]
lavc: move deprecated audio_resample* bellow
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Anton Khirnov [Mon, 21 Jan 2013 20:48:49 +0000 (21:48 +0100)]
vf_delogo: fix copying the input frame.
CC:libav-stable@libav.org
Anton Khirnov [Mon, 21 Jan 2013 20:10:54 +0000 (21:10 +0100)]
vf_delogo: fix an uninitialized read.
CC:libav-stable@libav.org
Anton Khirnov [Sat, 19 Jan 2013 08:15:37 +0000 (09:15 +0100)]
h264: remove obsolete comment.
Anton Khirnov [Sun, 13 Jan 2013 16:54:50 +0000 (17:54 +0100)]
mpegvideo: remove some unused variables from Picture.
Anton Khirnov [Mon, 7 Jan 2013 10:39:56 +0000 (11:39 +0100)]
utvideoenc/v410enc: do not set AVFrame.reference.
That field will be deprecated.
Anton Khirnov [Fri, 28 Dec 2012 08:54:29 +0000 (09:54 +0100)]
pthread: make ff_thread_release_buffer idempotent.
I.e. don't do anything on already released frames.
Anton Khirnov [Sat, 5 Jan 2013 10:45:51 +0000 (11:45 +0100)]
mvi: set framerate
This container does not store timestamps and thus supports CFR only.
Anton Khirnov [Thu, 3 Jan 2013 16:19:01 +0000 (17:19 +0100)]
rawdec: use AVPALETTE_SIZE instead of magic constants.
Anton Khirnov [Thu, 27 Dec 2012 08:01:38 +0000 (09:01 +0100)]
mimic: remove a pointless cast.
Anton Khirnov [Sun, 9 Dec 2012 17:55:53 +0000 (18:55 +0100)]
mdec: return meaningful error codes.
Anton Khirnov [Sun, 9 Dec 2012 17:52:55 +0000 (18:52 +0100)]
mdec: cosmetics, reformat
Anton Khirnov [Sun, 9 Dec 2012 17:44:44 +0000 (18:44 +0100)]
mdec: merge mdec_common_init() into decode_init().
There is no point in keeping those two functions separate.
Anton Khirnov [Wed, 21 Nov 2012 13:55:05 +0000 (14:55 +0100)]
eatgv: use fixed-width types where appropriate.
Michael Niedermayer [Tue, 29 Jan 2013 03:17:48 +0000 (04:17 +0100)]
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>
Piotr Bandurski [Tue, 29 Jan 2013 00:01:13 +0000 (11:01 +1100)]
iff/deep: fix rle32 on big-endian
Fixes ticket #2197.
Signed-off-by: Peter Ross <pross@xvid.org>
Diego Biurrun [Sat, 26 Jan 2013 11:19:34 +0000 (12:19 +0100)]
x86: Simplify some arch conditionals
Paul B Mahol [Mon, 28 Jan 2013 22:47:30 +0000 (22:47 +0000)]
takdec: switch to init_get_bits8()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Mon, 28 Jan 2013 22:12:24 +0000 (23:12 +0100)]
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>
Michael Niedermayer [Mon, 28 Jan 2013 21:43:30 +0000 (22:43 +0100)]
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>
Michael Niedermayer [Mon, 28 Jan 2013 20:44:25 +0000 (21:44 +0100)]
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>
Diego Biurrun [Mon, 28 Jan 2013 19:22:54 +0000 (20:22 +0100)]
bfin: Separate VP3 initialization code
Luca Barbato [Mon, 28 Jan 2013 19:19:07 +0000 (20:19 +0100)]
bfin: update VP3 idct
The block must be set to 0.
Michael Niedermayer [Mon, 28 Jan 2013 19:40:13 +0000 (20:40 +0100)]
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>
Michael Niedermayer [Mon, 28 Jan 2013 19:00:55 +0000 (20:00 +0100)]
dirac: Only use MMX if MMX is available.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 28 Jan 2013 18:34:55 +0000 (19:34 +0100)]
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>
Michael Niedermayer [Sun, 27 Jan 2013 21:36:37 +0000 (22:36 +0100)]
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>
Michael Niedermayer [Mon, 28 Jan 2013 13:25:19 +0000 (14:25 +0100)]
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>
Michael Niedermayer [Mon, 28 Jan 2013 13:06:22 +0000 (14:06 +0100)]
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>
Piotr Bandurski [Mon, 28 Jan 2013 11:29:37 +0000 (11:29 +0000)]
aasc: fix 16bpp on big-endian
Michael Niedermayer [Sun, 27 Jan 2013 14:50:26 +0000 (15:50 +0100)]
x86: hpeldsp: Fix a typo, use the right register
This makes the code actually work.
Signed-off-by: Martin Storsjö <martin@martin.st>
Luca Barbato [Mon, 28 Jan 2013 06:24:51 +0000 (07:24 +0100)]
shorten: fix array subscript is below array bounds warning
Incidentally fixes alpha builds.
Daniel Kang [Sun, 27 Jan 2013 20:28:58 +0000 (20:28 +0000)]
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>
Stephan Hilb [Sun, 27 Jan 2013 11:17:39 +0000 (12:17 +0100)]
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>
Michael Niedermayer [Sun, 27 Jan 2013 22:45:44 +0000 (23:45 +0100)]
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>
Michael Niedermayer [Sun, 27 Jan 2013 21:44:29 +0000 (22:44 +0100)]
aacdec: check init_get_bits return
Also fixes an integer overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 27 Jan 2013 20:52:24 +0000 (21:52 +0100)]
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>
Carl Eugen Hoyos [Sun, 27 Jan 2013 22:24:52 +0000 (23:24 +0100)]
Write forced track flag to matroska files.
Based on a patch by Daniel Pielmeier, daniel pielmeier gmail
Fixes a part of ticket #1815.
Carl Eugen Hoyos [Sun, 27 Jan 2013 21:49:48 +0000 (22:49 +0100)]
Fix some avi rawvideo formats on big endian.
Fixes ticket #2196.
Michael Niedermayer [Fri, 25 Jan 2013 20:51:25 +0000 (21:51 +0100)]
swscale: GBRP output support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Michael Niedermayer [Sun, 27 Jan 2013 20:17:32 +0000 (21:17 +0100)]
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>
Michael Niedermayer [Sun, 27 Jan 2013 19:37:27 +0000 (20:37 +0100)]
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>
Matthieu Bouron [Sat, 26 Jan 2013 11:46:01 +0000 (12:46 +0100)]
lavc/dnxhdenc: print valid profiles when codec parameters are invalid
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Matthieu Bouron [Sat, 26 Jan 2013 11:45:59 +0000 (12:45 +0100)]
lavc/dnxhddata: add frame_rates field to cid table
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Giorgio Vazzana [Sat, 26 Jan 2013 12:37:37 +0000 (13:37 +0100)]
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>
Stefano Sabatini [Tue, 15 Jan 2013 11:45:13 +0000 (12:45 +0100)]
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.
Stefano Sabatini [Sat, 26 Jan 2013 11:56:36 +0000 (12:56 +0100)]
ffmpeg: remove -crop* and -pad* options
The options have been deprecated and are non-operational since more than
two years.
Stefano Sabatini [Sun, 9 Dec 2012 17:40:22 +0000 (18:40 +0100)]
ffmpeg: implement -force_key_frames expression evalution
Michael Niedermayer [Sun, 27 Jan 2013 15:47:50 +0000 (16:47 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
arm: vp8: Fix the plain-armv6 version of vp8_luma_dc_wht
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 27 Jan 2013 15:29:57 +0000 (16:29 +0100)]
Merge commit '
96753bd00d6d4046db6818c0aadc21bf2a11d77b'
* commit '
96753bd00d6d4046db6818c0aadc21bf2a11d77b':
dsputil: x86: Correct the number of registers used in put_no_rnd_pixels16_l2
dsputil: add missing HAVE_YASM guard
hwaccel: do not offer unsupported pixel formats
vdpau: add missing pixel format for H.264
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 27 Jan 2013 14:50:26 +0000 (15:50 +0100)]
AVG_PIXELS8_XY2: fix typo, make code actually work
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>