]>
git.sesse.net Git - ffmpeg/log
Paul B Mahol [Sun, 8 Sep 2013 10:53:55 +0000 (10:53 +0000)]
avfilter/vf_psnr: refactor subsampled format support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Clément Bœsch [Sun, 8 Sep 2013 10:36:57 +0000 (12:36 +0200)]
avformat/subtitles: binary search seeking.
Clément Bœsch [Sun, 8 Sep 2013 07:55:02 +0000 (09:55 +0200)]
avformat/subtitles: check lower bound for duration overlap seeking.
Clément Bœsch [Sun, 8 Sep 2013 07:43:53 +0000 (09:43 +0200)]
avformat/vobsub: fix seeking.
Michael Niedermayer [Sun, 8 Sep 2013 10:14:33 +0000 (12:14 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavf: fix the comparison in an overflow check
Conflicts:
libavformat/utils.c
See:
a5d67bc796e1f9a2b99b43ea807166b655e4bdbc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 8 Sep 2013 09:46:18 +0000 (11:46 +0200)]
Merge commit '
7ee191cab0dc44700f26c5784e2adeb6a779651b '
* commit '
7ee191cab0dc44700f26c5784e2adeb6a779651b ':
dv: Add a guard to not overread the ppcm array
See:
3669915e93b3df63034857534245c3f2575d78ff
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 8 Sep 2013 09:40:45 +0000 (11:40 +0200)]
oMerge commit '
85ac12587bfef970d0e0e4abc292df346daf8478 '
* commit '
85ac12587bfef970d0e0e4abc292df346daf8478 ':
nuv: check ff_rtjpeg_decode_frame_yuv420 return value
Conflicts:
libavcodec/nuv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Fri, 6 Sep 2013 04:10:48 +0000 (01:10 -0300)]
doc: add *install-doc that covers all documentation
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 8 Sep 2013 03:17:34 +0000 (05:17 +0200)]
avcodec/snowenc: fix constness of the AVFrame argument in encode_frame()
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>
Paul B Mahol [Sat, 7 Sep 2013 21:04:12 +0000 (21:04 +0000)]
avfilter/vf_histeq: remove unused item from filter private context
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sat, 7 Sep 2013 20:16:26 +0000 (22:16 +0200)]
vformat/tee: fix uninitialized use of ret
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sat, 7 Sep 2013 20:37:48 +0000 (20:37 +0000)]
avfilter/vf_format: add .get_video_buffer back
Unbreak xyz12 with vflip.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
James Almer [Fri, 6 Sep 2013 04:08:31 +0000 (01:08 -0300)]
doc: rename *install-doc to *install-html
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sun, 1 Sep 2013 22:00:06 +0000 (19:00 -0300)]
doc: fix install-doc dependencies
Put it inside its own ifdef conditional.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sat, 7 Sep 2013 18:34:03 +0000 (18:34 +0000)]
avfilter/vf_rotate: fix 'oh' option description
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sat, 7 Sep 2013 13:26:11 +0000 (13:26 +0000)]
avfilter: remove redundant .get_(audio/video)_buffer initializations
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 6 Sep 2013 22:25:00 +0000 (22:25 +0000)]
avfilter/af_asetnsamples: remove .needs_writable as it is not required
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Anton Khirnov [Wed, 4 Sep 2013 06:55:08 +0000 (08:55 +0200)]
lavf: fix the comparison in an overflow check
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Mon, 5 Aug 2013 20:15:24 +0000 (22:15 +0200)]
dv: Add a guard to not overread the ppcm array
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Sun, 11 Aug 2013 18:35:40 +0000 (20:35 +0200)]
nuv: check ff_rtjpeg_decode_frame_yuv420 return value
CC: libav-stable@libav.org
Michael Niedermayer [Sat, 7 Sep 2013 01:07:34 +0000 (03:07 +0200)]
avfilter/af_compand: silence "maybe uninitialized" warnings
if channels is 0 it actually would be uninitialized, thus an assert with comment is added
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 7 Sep 2013 01:07:34 +0000 (03:07 +0200)]
avfilter/af_aecho: silence "maybe uninitialized warning"
if channels is 0 it actually would be uninitialized, thus an assert with comment is added
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Kirill Gavrilov [Fri, 6 Sep 2013 17:32:31 +0000 (21:32 +0400)]
lavu: provide msvc implementation of attribute_deprecated
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 6 Sep 2013 18:45:27 +0000 (18:45 +0000)]
lavfi/telecine: remove bitstream and pal formats
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 6 Sep 2013 14:34:28 +0000 (14:34 +0000)]
lavfi/fieldorder: work with non writtable frames too
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 6 Sep 2013 18:32:25 +0000 (18:32 +0000)]
lavfi/fieldorder: remove pal8 format
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 6 Sep 2013 14:07:57 +0000 (14:07 +0000)]
lavfi/fieldorder: add timeline support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 6 Sep 2013 14:04:48 +0000 (14:04 +0000)]
lavfi/fieldorder: use av_image_fill_linesizes()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 6 Sep 2013 13:58:59 +0000 (13:58 +0000)]
lavfi/fieldorder: remove redundant get_video_buffer()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 6 Sep 2013 16:32:47 +0000 (16:32 +0000)]
s302m: s/bits_per_coded_sample/bits_per_raw_sample
bits_per_coded_sample should be set from demuxer and
not from decoder.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 6 Sep 2013 17:18:17 +0000 (17:18 +0000)]
avcodec/xan: use uint8_t instead of unsigned char
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 6 Sep 2013 16:59:32 +0000 (16:59 +0000)]
pixfmt: add native GBRAP16 format
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 4 Sep 2013 12:59:18 +0000 (12:59 +0000)]
lavfi: Weston 3 Field Deinterlacing Filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Fri, 6 Sep 2013 11:50:46 +0000 (13:50 +0200)]
Merge remote-tracking branch 'qatar/master'
* 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>
Michael Niedermayer [Fri, 6 Sep 2013 11:33:01 +0000 (13:33 +0200)]
Merge commit '
97b052e56807fab6887e9ba210a28a622e6a4b78 '
* commit '
97b052e56807fab6887e9ba210a28a622e6a4b78 ':
avisynth: Add missing #include for NULL_IF_CONFIG_SMALL
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Sep 2013 11:17:12 +0000 (13:17 +0200)]
Merge commit '
befe044bb9561c9d7d6559db06bba375e82a4b66 '
* 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>
Michael Niedermayer [Fri, 6 Sep 2013 11:00:47 +0000 (13:00 +0200)]
Merge commit '
7f93a861aaf2e76fd63b53ccc465909873b8dc29 '
* commit '
7f93a861aaf2e76fd63b53ccc465909873b8dc29 ':
mpeg12enc: K&R formatting cosmetics
Conflicts:
libavcodec/mpeg12enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Sep 2013 10:34:09 +0000 (12:34 +0200)]
Merge commit '
66f091053f11a8957b2175480d2f368d2cf4474c '
* commit '
66f091053f11a8957b2175480d2f368d2cf4474c ':
mpeg12enc: drop forward declarations
Conflicts:
libavcodec/mpeg12enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Sep 2013 10:21:16 +0000 (12:21 +0200)]
Merge commit '
c3e6e8f06c42499bd020fd0b37f9542150e6067b '
* commit '
c3e6e8f06c42499bd020fd0b37f9542150e6067b ':
mem: Do not check unsigned values for negative size
Conflicts:
libavutil/mem.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Sep 2013 10:05:02 +0000 (12:05 +0200)]
Merge commit '
b634b36fcebfe16b837b6c4044f5d5cb99a75040 '
* commit '
b634b36fcebfe16b837b6c4044f5d5cb99a75040 ':
mem: Improve documentation wording and spelling
Conflicts:
libavutil/mem.c
libavutil/mem.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Wed, 4 Sep 2013 18:01:59 +0000 (20:01 +0200)]
avisynth: K&R formatting cosmetics
Diego Biurrun [Wed, 4 Sep 2013 18:03:14 +0000 (20:03 +0200)]
avisynth: Add missing #include for NULL_IF_CONFIG_SMALL
Michael Niedermayer [Fri, 6 Sep 2013 00:33:10 +0000 (02:33 +0200)]
avcodec/mjpegdec: support >8bit in mjpeg_decode_scan_progressive_ac()
Fixes Ticket2812
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 6 Sep 2013 00:31:32 +0000 (02:31 +0200)]
avcodec/mjpegdec: move shift_output() to its own function
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 5 Sep 2013 22:57:50 +0000 (00:57 +0200)]
avcodec/mjpegdec: 12bit Grayscale support
Fixes part of Ticket2812
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 5 Sep 2013 22:56:44 +0000 (00:56 +0200)]
avcodec/mjpegdec: Fix normal jpeg with bits < 8
Untested due to lack of testcase
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 5 Sep 2013 22:55:32 +0000 (00:55 +0200)]
avcodec/mjpegdec fix last_dc for bits != 8
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 5 Sep 2013 22:10:45 +0000 (00:10 +0200)]
avcodec/dsputil: add 12bit simple idct
Will be needed for jpeg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Thu, 5 Sep 2013 20:22:47 +0000 (20:22 +0000)]
lavfi/mp: remove mp=fil
The filter does not work correctly most of time.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diego Biurrun [Thu, 5 Sep 2013 10:05:57 +0000 (12:05 +0200)]
avcodec: Stop exporting the removed audio_resample* symbols
Paul B Mahol [Wed, 4 Sep 2013 11:43:06 +0000 (11:43 +0000)]
lavfi/mp: remove mp=dint
There are better and actually maintained filters that have similar
functionality.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Vittorio Giovara [Wed, 4 Sep 2013 15:17:30 +0000 (17:17 +0200)]
mpeg12enc: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Thu, 5 Sep 2013 18:53:12 +0000 (20:53 +0200)]
avfilter/vf_yadif: Treat mode as a field of flags
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 5 Sep 2013 17:58:45 +0000 (19:58 +0200)]
avfilter/vf_yadif: fix "incompatible pointer type" warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 5 Sep 2013 12:06:17 +0000 (14:06 +0200)]
avfilter/vf_yadif: add gbr(a)p support
Suggested-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 5 Sep 2013 11:34:37 +0000 (13:34 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
matroskaenc: Allow chapters to be written in trailer
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Wed, 4 Sep 2013 15:17:29 +0000 (17:17 +0200)]
mpeg12enc: drop forward declarations
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diego Biurrun [Wed, 4 Sep 2013 10:28:01 +0000 (12:28 +0200)]
mem: Do not check unsigned values for negative size
Diego Biurrun [Wed, 4 Sep 2013 10:27:09 +0000 (12:27 +0200)]
mem: Improve documentation wording and spelling
Michael Niedermayer [Wed, 4 Sep 2013 23:32:51 +0000 (01:32 +0200)]
avcodec/mjpegdec: Simplify masking in ljpeg_decode_yuv_scan()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 Sep 2013 23:29:31 +0000 (01:29 +0200)]
avcodec/mjpegdec: fix rgb ljpeg prediction 5/6/7 with point_transform
untested due to lack of sample
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 Sep 2013 23:25:59 +0000 (01:25 +0200)]
avcodec/mjpegdec: fix yuv ljpeg prediction 5/6/7 with point transforms
Fixes Ticket2826
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 23 Jul 2013 02:12:04 +0000 (04:12 +0200)]
avcodec/jpeg2000dec: make SOC finding code more robust
Fixes file from Ticket860
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 Sep 2013 22:39:04 +0000 (00:39 +0200)]
avcodec/mjpegdec: make "unknown colorspace" error more informative
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 Sep 2013 22:36:44 +0000 (00:36 +0200)]
avcodec/mjpegdec: Add some sanity checks to ljpeg_decode_rgb_scan()
These prevent the rgb ljpeg code from being run on parameters that it doesnt
support. No testcase available but it seems possible to trigger these.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Wed, 4 Sep 2013 20:18:59 +0000 (22:18 +0200)]
doc/APIchanges: update hashes and dates after last two commits.
Sorry, I'm too lazy to fix the rest.
Clément Bœsch [Tue, 3 Sep 2013 20:25:17 +0000 (22:25 +0200)]
avcodec: make avcodec_close() more tolerant.
See previous commit.
Clément Bœsch [Tue, 3 Sep 2013 20:22:19 +0000 (22:22 +0200)]
avformat: make avformat_close_input() more tolerant.
The purpose of this commit is to make error management simpler and less
error prone, just like av_free() which is safe with NULL.
Clément Bœsch [Wed, 4 Sep 2013 17:51:33 +0000 (19:51 +0200)]
tools/crypto_bench: fix 2 typos.
Michael Niedermayer [Wed, 4 Sep 2013 19:00:24 +0000 (21:00 +0200)]
avcodec/avpacket: zero memory in av_packet_new_side_data()
This ensures that no uninitialized bytes cause non-deterministic behavior.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
John Stebbins [Tue, 3 Sep 2013 17:53:34 +0000 (10:53 -0700)]
matroskaenc: Allow chapters to be written in trailer
This allows creation of frame accurate chapter marks from sources like
DVD and BD where the precise chapter location is not known until the
chapter mark has been reached during reading.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Nicolas George [Thu, 22 Aug 2013 18:25:09 +0000 (20:25 +0200)]
lavc/avfft: init context to 0.
Prevent an invalid free in case of init failure.
Nicolas George [Tue, 3 Sep 2013 14:39:02 +0000 (16:39 +0200)]
ffprobe: show bitmap subtitles size.
Fix trac ticket #2930.
Nicolas George [Tue, 3 Sep 2013 18:05:06 +0000 (20:05 +0200)]
lavc/libvorbisdec: do not return empty frames.
Some parts of the code have been known to react badly to
empty frames; they should not, but there is no need to
take risks.
Nicolas George [Thu, 16 May 2013 18:10:11 +0000 (20:10 +0200)]
tools: add benchmark for crypto functions.
The benchmark tests the speed of the following algorithms:
MD5, SHA-1, SHA-256, SHA-512, RIPEMD-160, AES-128.
It can optionally be built to perform the same benchmark on
other crypto libraries, for comparison purposes.
The supported libraries are:
- crypto: OpenSSL's libcrypto;
- gcrypt: GnuTLS's libgcrypt;
- tomcrypt: LibTomCrypt
To enable them, use this syntax:
make VERSUS=crypto+gcrypt+tomcrypt tools/crypto_bench
They do not need to have been enabled in configure.
Clément Bœsch [Wed, 4 Sep 2013 13:49:18 +0000 (15:49 +0200)]
doc/examples: fix lib math dep for resampling_audio.
It uses at least sin()
Clément Bœsch [Wed, 4 Sep 2013 13:48:11 +0000 (15:48 +0200)]
avcodec: fix AVpacket → AVPacket typo.
Clément Bœsch [Wed, 4 Sep 2013 13:46:01 +0000 (15:46 +0200)]
doc/examples: remove extra "the".
"into the doc/examples directory" vs "into doc/examples".
Michael Niedermayer [Wed, 4 Sep 2013 12:22:20 +0000 (14:22 +0200)]
avcodec: add emuedge_linesize_type
Currently all uses of the emu edge code as well as the code itself
assume int linesize
changing some but not changing all would introduce a security issue
once all use this typedef a simple search and replace can be
done to switch them all to ptrdiff_t
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 Sep 2013 12:11:29 +0000 (14:11 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegvideo: Avoid 32-bit wrapping of linesize multiplications
This is not merged as its not correct for ffmpeg and would introduce a
security issue if merged as is.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 Sep 2013 12:06:46 +0000 (14:06 +0200)]
Merge commit '
0ebfdae099d2749240b6a565abcdf0bf62589748 '
* commit '
0ebfdae099d2749240b6a565abcdf0bf62589748 ':
doc: Describe TB option of setpts filter
Conflicts:
doc/filters.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 Sep 2013 11:48:29 +0000 (13:48 +0200)]
Merge commit '
b4ec7a5fee644ad9882e10c097817b65447b8e55 '
* commit '
b4ec7a5fee644ad9882e10c097817b65447b8e55 ':
mem: Document the av_realloc family of functions properly
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Tue, 3 Sep 2013 22:36:51 +0000 (01:36 +0300)]
mpegvideo: Avoid 32-bit wrapping of linesize multiplications
This makes sure that linesize * start_y doesn't overflow, so that
emulated_edge_mc can get back the original value if needed.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Wed, 4 Sep 2013 11:15:00 +0000 (13:15 +0200)]
Merge commit '
7f9e893f56db52078e0f46677ed337b2e25fa94d '
* commit '
7f9e893f56db52078e0f46677ed337b2e25fa94d ':
build: Report an error message when a pc file is not found
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 Sep 2013 11:04:29 +0000 (13:04 +0200)]
Merge commit '
af11fa5409cc72fc45ca7f3527400beca10967b9 '
* commit '
af11fa5409cc72fc45ca7f3527400beca10967b9 ':
mjpegb: Detect changing number of planes in interlaced video
Conflicts:
libavcodec/mjpegdec.c
See:
ecc31630f9a16ead4272a078c281afcb4db87f21
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 Sep 2013 10:56:28 +0000 (12:56 +0200)]
Merge commit '
35cbc98b720db95b923cb2d745f77bb2ee4363dc '
* commit '
35cbc98b720db95b923cb2d745f77bb2ee4363dc ':
alac: Check that the channels fit at the given offset
Conflicts:
libavcodec/alac.c
See:
b53f89710b03c4c832bb03e4e132b1ace17fb4e4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clifford Wolf [Sun, 1 Sep 2013 09:07:17 +0000 (11:07 +0200)]
doc: Describe TB option of setpts filter
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Wed, 4 Sep 2013 10:20:53 +0000 (12:20 +0200)]
Merge commit '
d719981273bc779c7d1e879d88404fd867f93a0e '
* commit '
d719981273bc779c7d1e879d88404fd867f93a0e ':
4xm: Check that the read track value is non-negative
Conflicts:
libavformat/4xm.c
See:
0838cfdc8a10185604db5cd9d6bffad71279a0e8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 Sep 2013 10:06:36 +0000 (12:06 +0200)]
Merge commit '
5bcd3ae5b167fb74215520b01d5d810e0c8986ab '
* commit '
5bcd3ae5b167fb74215520b01d5d810e0c8986ab ':
matroskadec: Check that .lang was allocated and set before reading it
Conflicts:
libavformat/matroskadec.c
See:
01fd1aa0ad2b95045df35f94ee9de073d24609c8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 Sep 2013 09:50:54 +0000 (11:50 +0200)]
Luca Barbato [Sun, 1 Sep 2013 17:46:59 +0000 (19:46 +0200)]
mem: Document the av_realloc family of functions properly
realloc() does not accept pointers from memalign().
Luca Barbato [Tue, 3 Sep 2013 20:15:23 +0000 (22:15 +0200)]
build: Report an error message when a pc file is not found
Ease tracking path problems.
Michael Niedermayer [Tue, 3 Sep 2013 23:51:07 +0000 (01:51 +0200)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Show subtitle resolution in avcodec_string().
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 3 Sep 2013 22:58:16 +0000 (00:58 +0200)]
avformat/utils: assert position monotonicity in ff_find_last_ts()
This ensures that no read timestamp functions finds packets before the search window in ff_find_last_ts()
which could cause an infinite loop
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Tue, 3 Sep 2013 23:04:01 +0000 (01:04 +0200)]
Show subtitle resolution in avcodec_string().
Michael Niedermayer [Tue, 3 Sep 2013 22:55:38 +0000 (00:55 +0200)]
avformat/mpegts: Ensure that mpegts_get_dts() only considers packets at or after the given position
This fixes an infinite loop
An alternative fix would be to revert
d73cbc22c5f2c305838d9867538cf4ad59c4035f
but that would worsen error resilience.
Found-by: Justin Ruggles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 3 Sep 2013 21:54:01 +0000 (23:54 +0200)]
fate: Force diff into text mode
On openbsd the exif-image-jpg test fails but diff treats the files as
binary due to some non ascii symbols in them. This should force it to
treat them as text, which should result in more informative output
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 3 Sep 2013 19:49:12 +0000 (21:49 +0200)]
avcodec/pictordec: remove y checks, which have become redundant
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 3 Sep 2013 19:45:25 +0000 (21:45 +0200)]
avcodec/pictordec: run av_image_check_size() unconditionally
This ensures that no invalid size leaks through
(This issue is hypothetical, ive no testcase)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Tue, 3 Sep 2013 17:31:05 +0000 (17:31 +0000)]
lavfi/mptestsrc: use outlink->frame_count
Signed-off-by: Paul B Mahol <onemda@gmail.com>