OSDN Git Service
Michael Niedermayer [Sat, 2 Feb 2013 12:01:45 +0000 (13:01 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vf_hqdn3d: x86: Add proper arch optimization initialization
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sat, 2 Feb 2013 11:29:58 +0000 (12:29 +0100)]
Map the interlaced flag of yuv4mpeg streams to AVCodecContext->field_order.
Fixes a part of ticket #2190.
Steven Boswell II [Sat, 26 Jan 2013 21:08:47 +0000 (13:08 -0800)]
build-sys: Fix pkgconfig files when ffmpeg is built with --build-suffix
Tested-on: Fedora Core 14, 16, and 17.
Tested-on: Ubuntu by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Fri, 1 Feb 2013 22:55:54 +0000 (23:55 +0100)]
Do not fail for mixed interlaced / non-interlaced YUV4MPEG streams.
Ronald S. Bultje [Fri, 1 Feb 2013 19:04:50 +0000 (11:04 -0800)]
vp56: remove clear_blocks call, and clear alpha plane U/V DC only.
The non-alpha and alpha-Y planes are cleared in the idct_put/add()
calls. For the alpha U/V planes, we only care about the DC for entropy
context prediction purposes, the rest of the data is unused.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Fri, 1 Feb 2013 22:27:15 +0000 (23:27 +0100)]
Do not change codec in flv streams if the user has forced a codec.
Fixes ticket #2218.
Matthieu Bouron [Fri, 1 Feb 2013 17:58:14 +0000 (18:58 +0100)]
ffmpeg: fix broken channel_layout option
Fixes ticket #2163.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Fri, 1 Feb 2013 17:52:42 +0000 (18:52 +0100)]
doc/filters: fix syntax and typo for the afade curve option
Stefano Sabatini [Fri, 1 Feb 2013 17:35:15 +0000 (18:35 +0100)]
doc/filters: create a dedicated examples section for lut*, and itemize
Stefano Sabatini [Fri, 1 Feb 2013 17:32:21 +0000 (18:32 +0100)]
doc/filters: fix syntax and description for the lut* options
Stefano Sabatini [Fri, 1 Feb 2013 17:12:54 +0000 (18:12 +0100)]
doc/muxers: fix level for the segment options subsection
Properly declare it like a @subsection, rather than as a @section.
Carl Eugen Hoyos [Fri, 1 Feb 2013 16:54:48 +0000 (17:54 +0100)]
doc/muxers.texi: Fix mp3 picture attachment documentation.
Michael Niedermayer [Fri, 1 Feb 2013 13:34:18 +0000 (14:34 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Use proper "" quotes for local header #includes
ppc: fmtconvert: Drop two unused variables.
bink demuxer: set framerate.
Conflicts:
libavcodec/kbdwin.c
libavcodec/ppc/fmtconvert_altivec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 1 Feb 2013 13:24:46 +0000 (14:24 +0100)]
Merge commit '
1730ca2eca42974af0c29f38a0770997cba2f0da'
* commit '
1730ca2eca42974af0c29f38a0770997cba2f0da':
bink demuxer: check malloc return value
See:
commit
e400b95b3205d5b861346f525cf6f423d93d2f04
Author: Paul B Mahol <onemda@gmail.com>
Date: Sat Jun 9 10:57:14 2012 +0000
bink: check av_mallocz() return value
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 1 Feb 2013 12:59:00 +0000 (13:59 +0100)]
Merge commit '
f2960097e42ddf9a356bab6547f87906f6999e0a'
* commit '
f2960097e42ddf9a356bab6547f87906f6999e0a':
bink: fix a check for the first frame.
doc/developer: Drop obsolete MPlayer reference
doc/developer: Add ISC license to list of acceptable licenses
doc/developer: Add web links for all suggested licenses
Conflicts:
doc/developer.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Tue, 22 Jan 2013 00:39:37 +0000 (01:39 +0100)]
vf_hqdn3d: x86: Add proper arch optimization initialization
Diego Biurrun [Fri, 1 Feb 2013 09:27:45 +0000 (10:27 +0100)]
Use proper "" quotes for local header #includes
Diego Biurrun [Fri, 1 Feb 2013 00:54:19 +0000 (01:54 +0100)]
ppc: fmtconvert: Drop two unused variables.
Anton Khirnov [Thu, 31 Jan 2013 20:07:34 +0000 (21:07 +0100)]
bink demuxer: set framerate.
Anton Khirnov [Thu, 31 Jan 2013 20:02:06 +0000 (21:02 +0100)]
bink demuxer: check malloc return value
Anton Khirnov [Thu, 31 Jan 2013 19:58:27 +0000 (20:58 +0100)]
bink: fix a check for the first frame.
Packet pts is a very unreliable indicator, use
AVCodecContext.frame_number instead.
Diego Biurrun [Thu, 31 Jan 2013 18:47:22 +0000 (19:47 +0100)]
doc/developer: Drop obsolete MPlayer reference
Diego Biurrun [Thu, 31 Jan 2013 18:37:08 +0000 (19:37 +0100)]
doc/developer: Add ISC license to list of acceptable licenses
Diego Biurrun [Thu, 31 Jan 2013 18:34:37 +0000 (19:34 +0100)]
doc/developer: Add web links for all suggested licenses
Michael Niedermayer [Fri, 1 Feb 2013 02:56:51 +0000 (03:56 +0100)]
dict: fix memleak
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 1 Feb 2013 01:33:37 +0000 (02:33 +0100)]
Merge remote-tracking branch 'mjbshaw/master'
* mjbshaw/master:
libopenjpegenc: simplify switch statement
libopenjpegenc: add support for pix fmt gbrp (8-16 bit)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Allan Kristensen [Fri, 21 Dec 2012 20:04:18 +0000 (21:04 +0100)]
matroska: fixed missing S_DVBSUB subtitles
Sebastian Sandberg [Thu, 31 Jan 2013 17:04:21 +0000 (18:04 +0100)]
vc1dec: fieldtx is only valid for interlaced frames
the fieldtx_plane is not cleared for interlaced fields
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Bradshaw [Thu, 31 Jan 2013 23:03:58 +0000 (16:03 -0700)]
libopenjpegenc: simplify switch statement
Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>
Michael Bradshaw [Thu, 31 Jan 2013 14:24:11 +0000 (07:24 -0700)]
libopenjpegenc: add support for pix fmt gbrp (8-16 bit)
Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>
Michael Niedermayer [Thu, 31 Jan 2013 22:20:15 +0000 (23:20 +0100)]
vc1dec: fix block_off
Fixes corruption of motion_val
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Thu, 31 Jan 2013 15:38:06 +0000 (16:38 +0100)]
doc/indevs: document v4l2 options
Reviewed-By: Giorgio Vazzana <mywing81@gmail.com>
Stefano Sabatini [Thu, 31 Jan 2013 15:21:47 +0000 (16:21 +0100)]
doc/indevs: itemize examples for the v4l2 device
Nicolas George [Thu, 31 Jan 2013 13:49:43 +0000 (14:49 +0100)]
lavfi/buffersrc: forward filter_frame errors.
Note: The ret variable was unused.
Nicolas George [Thu, 31 Jan 2013 13:26:15 +0000 (14:26 +0100)]
lavfi/af_amerge: set outbuf->audio->channels.
The value is lost because of avfilter_copy_buffer_ref_props().
Fix trac ticket #2217.
Nicolas George [Thu, 31 Jan 2013 13:24:57 +0000 (14:24 +0100)]
lavfi/af_amerge: check for buffer queue overflows.
Without that test, ff_bufqueue_add silently discards the
oldest buffer, that leaves in[i].nb_samples inconsistent,
and causes later a segfault.
Nicolas George [Thu, 31 Jan 2013 13:24:08 +0000 (14:24 +0100)]
lavfi/bufferqueue: add ff_bufqueue_is_full().
Michael Niedermayer [Thu, 31 Jan 2013 19:03:29 +0000 (20:03 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: hpel: Move {avg,put}_pixels16_sse2 to hpeldsp
configure: Add a comment indicating why uclibc is checked before glibc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 31 Jan 2013 18:52:58 +0000 (19:52 +0100)]
Merge commit '
29f1fa74225e9fdbab6d590857edbecb51cf74da'
* commit '
29f1fa74225e9fdbab6d590857edbecb51cf74da':
configure: Move newlib libc check before mingw libc check
avisynth: Change demuxer name to avoid conflicts with AVS
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 31 Jan 2013 18:19:29 +0000 (19:19 +0100)]
Merge commit '
a65f965c04bfa27adedc0409c14cc05903f483d0'
* commit '
a65f965c04bfa27adedc0409c14cc05903f483d0':
mpegvideo: Do REBASE_PICTURE with byte pointers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 31 Jan 2013 18:00:20 +0000 (19:00 +0100)]
Merge commit '
a5ba798c16d0614d982a76755fdd72b37d437170'
* commit '
a5ba798c16d0614d982a76755fdd72b37d437170':
dsputil: remove unused functions copy_block{2, 4, 8, 16}.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sat, 19 Jan 2013 00:34:27 +0000 (01:34 +0100)]
CREDITS: redirect to Git log, remove current outdated content
All the removed names are already mentioned in the commit log, or are
listed as copyright holders in the contributed files.
Amongst the removed names, the following ones were not listed in the
commit log:
Mario Brito (Xan DPCM decoder)
Brian Foley (DSP utils optimizations)
Vladimir Gneushev (lavf/lavc)
Juan J. Sierralta (H.263)
Ewald Snel (qdm2, cinepak)
Lionel Ulmer (DSP utils optimizations)
Paul B Mahol [Thu, 31 Jan 2013 16:18:50 +0000 (16:18 +0000)]
doc/filters: fix afade cuve types listing
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Stefano Sabatini [Thu, 31 Jan 2013 15:47:37 +0000 (16:47 +0100)]
lavfi: increment max number of registered filters from 128 to 256
The total number of implemented filters is already over 128.
Stefano Sabatini [Thu, 31 Jan 2013 11:53:50 +0000 (12:53 +0100)]
doc/indevs: apply misc fixes to the v4l2 documentation
Reviewed-by: Giorgio Vazzana <mywing81@gmail.com>
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
Diego Biurrun [Tue, 29 Jan 2013 18:28:07 +0000 (19:28 +0100)]
x86: hpel: Move {avg,put}_pixels16_sse2 to hpeldsp
Diego Biurrun [Wed, 30 Jan 2013 23:43:18 +0000 (00:43 +0100)]
configure: Move newlib libc check before mingw libc check
On Cygwin systems MinGW headers can be present if the corresponding
packages have been installed. Since the MinGW libc is checked for
first, this results in newlib getting misdetected as MinGW libc.
Diego Biurrun [Wed, 30 Jan 2013 23:50:51 +0000 (00:50 +0100)]
configure: Add a comment indicating why uclibc is checked before glibc
Diego Biurrun [Tue, 29 Jan 2013 17:00:34 +0000 (18:00 +0100)]
avisynth: Change demuxer name to avoid conflicts with AVS
Martin Storsjö [Thu, 31 Jan 2013 08:19:57 +0000 (10:19 +0200)]
mpegvideo: Do REBASE_PICTURE with byte pointers
REBASE_PICTURE (more specifically, this half of it) takes a Picture
pointer that points into one larger struct, finds the offset of
that Picture within the struct and finds the corresponding field
within another instance of a similar struct.
The pointer difference "pic - (Picture*)old_ctx" is a value given
in sizeof(Picture) units, and when applied back on
(Picture*)new_ctx gets multiplied back with sizeof(Picture). Many
compilers seem to optimize out this division/multiplication, but
not all do.
GCC 4.2 on OS X doesn't seem to remove the division/multiplication,
therefore the new pointer didn't turn out to point to exactly
the right place in the new struct since it only had sizeof(Picture)
granularity (and the Picture is not aligned on a sizeof(Picture)
boundary within the encompassing struct). This bug has been present
before
47318953d as well - with H264, pointers to h->ref_list[0][0]
pointed to 88 bytes before h->ref_list[0][0] after the rebase. After
shrinking Picture, the difference ended up even larger, making
writes via such a Picture pointer overwrite other fields at random
in H264Context, ending up in crashes later.
This fixes H264 multithreaded decoding on OS X with GCC 4.2.
Signed-off-by: Martin Storsjö <martin@martin.st>
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>
Ronald S. Bultje [Tue, 29 Jan 2013 03:56:55 +0000 (19:56 -0800)]
dsputil: remove unused functions copy_block{2, 4, 8, 16}.
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>