* commit '430d12196432ded13f011a3bf7690f03c9b2e5d6':
pcx: round up in bits->bytes conversion in a buffer size check
Conflicts:
libavcodec/pcx.c
See: 6462268e74
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'c918e08b9cc9ce8d06159c51da55ec5ab018039a':
truemotion1: make sure index does not go out of bounds
See: fd4c1c0b70
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'ce9bba5340a5fb6f38974a19af019dd6aa2da035':
avidec: fix a memleak in the dv init code.
Conflicts:
libavformat/avidec.c
See: 8993c25695
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'ca41c72c6d9515d9045bd3b68104525dee81b8d0':
motionpixels: clip VLC codes.
Not merged, the change is wrong, the condition is not possible unless
there are serious bugs elsewhere. No such bugs should exist in ffmpeg.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '8b516f154a0a08655cec2d13d12aadc58cae0b1c':
matroskadec: use correct compression parameters for current track CodecPrivate
See: dc6c36ce46
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'c453723ad7d14abc5e82677eebaa6025fa598f08':
gifdec: check that the image dimensions are non-zero
Conflicts:
libavcodec/gifdec.c
See: 286930d302
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '074c769de93bf12e9f44d77e58a8c7167f9dfb13':
h264_cavlc: check the size of the intra PCM data.
This check is redundant, but does no harm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Happens on a B-frame when neither low_delay nor last_picture_ptr is set
(probably corrupted streams only).
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
It might be passed to code requiring padding, such as lzo decompression.
Fixes invalid reads.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
Also add an error message an return a more suitable error code
(INVALIDDATA, not EINVAL);
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
* commit 'd28fc7b29a728bd2f88c10121abbd0442c341746':
avconv_filter: add new line after error message
See: c790ae0265
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '874838dc6589d978611c89a40694a5074f892a76':
fate: add one select filter test
Conflicts:
tests/fate/filter-video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '305d3d9f1f7f0bdc18744f376a0ff5b012e4e6cf':
mpeg4videoenc: restore macro parentheses
No change, as the bug was spoted by ubitux and not merged
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* qatar/master:
configure: Avoid requiring c99wrap for working around msys path issues
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'a7b87ca9111bafb220ab94d53ab4e4ed48111800':
libxavs: rename and fix a variable name
Conflicts:
libavcodec/libxavs.c
See: 260fc0d95b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Msys is unable to convert unix style absolute paths to windows style
paths when combined with certain multichar MSVC options such as
-Fo<file>. We used to work around this issue by passing them as two
separate parameters separated by a space to c99wrap, which then mapped
them back to the actual parameter format that MSVC uses.
The only paths that actually are an issue are absolute unix style
paths, and the only place such absolute paths are used with the output
arguments (-Fo, -Fe, -Fi, -out:) are for the temp files within configure.
By setting TMPDIR to . for msvc/icl builds, we never need to use
absolute unix style paths for the file output, and we can use the
actual proper form of the file output parameters. This avoids requiring
the c99wrap wrapper for remapping the parameters for cases where the
c99 converter isn't invoked at all (MSVC2013 and ICL).
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer
gcocherelandMichael Niedermayer
Stefano Sabatini
Clément Bœsch
Anton Khirnov
Aurelien JacobsandAnton Khirnov
Diego Biurrun
Vittorio Giovara
Clément Bœsch
Martin Storsjö