Age | Commit message (Collapse) | Author |
|
|
|
* qatar/master:
lavf: fix the comparison in an overflow check
Conflicts:
libavformat/utils.c
See: a5d67bc796e1f9a2b99b43ea807166b655e4bdbc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit '7ee191cab0dc44700f26c5784e2adeb6a779651b':
dv: Add a guard to not overread the ppcm array
See: 3669915e93b3df63034857534245c3f2575d78ff
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit '85ac12587bfef970d0e0e4abc292df346daf8478':
nuv: check ff_rtjpeg_decode_frame_yuv420 return value
Conflicts:
libavcodec/nuv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Some fields of the frame are changed to reflect encoder decissions like
if its a keyframe. It thus cannot be constant.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Signed-off-by: Paul B Mahol <onemda@gmail.com>
|
|
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Unbreak xyz12 with vflip.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
|
|
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Put it inside its own ifdef conditional.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Signed-off-by: Paul B Mahol <onemda@gmail.com>
|
|
Signed-off-by: Paul B Mahol <onemda@gmail.com>
|
|
Signed-off-by: Paul B Mahol <onemda@gmail.com>
|
|
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
|
|
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
|
|
CC: libav-stable@libav.org
|
|
if channels is 0 it actually would be uninitialized, thus an assert with comment is added
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
if channels is 0 it actually would be uninitialized, thus an assert with comment is added
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Signed-off-by: Paul B Mahol <onemda@gmail.com>
|
|
Signed-off-by: Paul B Mahol <onemda@gmail.com>
|
|
Signed-off-by: Paul B Mahol <onemda@gmail.com>
|
|
Signed-off-by: Paul B Mahol <onemda@gmail.com>
|
|
Signed-off-by: Paul B Mahol <onemda@gmail.com>
|
|
Signed-off-by: Paul B Mahol <onemda@gmail.com>
|
|
bits_per_coded_sample should be set from demuxer and
not from decoder.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
|
|
Signed-off-by: Paul B Mahol <onemda@gmail.com>
|
|
Signed-off-by: Paul B Mahol <onemda@gmail.com>
|
|
Signed-off-by: Paul B Mahol <onemda@gmail.com>
|
|
* qatar/master:
avisynth: K&R formatting cosmetics
Conflicts:
libavformat/avisynth.c
Nothing changed as the avisynth code has been rewritten to
support avi/avxsynth in ffmpeg.
And the new code should be free of formating problems.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit '97b052e56807fab6887e9ba210a28a622e6a4b78':
avisynth: Add missing #include for NULL_IF_CONFIG_SMALL
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit 'befe044bb9561c9d7d6559db06bba375e82a4b66':
avcodec: Stop exporting the removed audio_resample* symbols
Conflicts:
libavcodec/libavcodec.v
Not merged as theres no pressing need to remove it now.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit '7f93a861aaf2e76fd63b53ccc465909873b8dc29':
mpeg12enc: K&R formatting cosmetics
Conflicts:
libavcodec/mpeg12enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit '66f091053f11a8957b2175480d2f368d2cf4474c':
mpeg12enc: drop forward declarations
Conflicts:
libavcodec/mpeg12enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit 'c3e6e8f06c42499bd020fd0b37f9542150e6067b':
mem: Do not check unsigned values for negative size
Conflicts:
libavutil/mem.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* commit 'b634b36fcebfe16b837b6c4044f5d5cb99a75040':
mem: Improve documentation wording and spelling
Conflicts:
libavutil/mem.c
libavutil/mem.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
|
|
|
|
Fixes Ticket2812
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Fixes part of Ticket2812
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Untested due to lack of testcase
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Will be needed for jpeg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
The filter does not work correctly most of time.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
|
|
|
|
There are better and actually maintained filters that have similar
functionality.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
|
|
Signed-off-by: Diego Biurrun <diego@biurrun.de>
|
|
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|