aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* avcodec/ac3dec: check bap before use.Michael Niedermayer2013-11-251-0/+4
| | | | | | | | | Fixes out of array read Fixes assertion failure Fixes asan_static-oob_16431c0_8036_rio_bravo_mono_64_spx.ac3 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Revert "Merge remote-tracking branch 'qatar/master'" ↵Michael Niedermayer2013-11-251-14/+10
| | | | | | | | | | (43dec5ef9a360c9ffac3278f464832bd99af0cb0) Fixes out of array accesses Fixes asan_static-oob_eb9812_5961_iv41.avi This reverts the merge of c9ef6b09326a24010bf86d6b0d19cfa42df4d546 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
* ffprobe: add support for subtitle framesMarton Balint2013-11-253-6/+55
| | | | | Signed-off-by: Marton Balint <cus@passwd.hu> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* lavf/segment: add a few log messages when avio_open2() failsStefano Sabatini2013-11-251-3/+9
|
* lavf/segment: add segment_list_entry_prefix optionStefano Sabatini2013-11-253-4/+27
| | | | | | | | | This option allows to add a prefix to the segment list entry filenames. Also set by default the list entry filenames to the corresponding segment basename, consistent with the HLS muxer. Based on an idea by Steven Liu <lingjiujianke@gmail.com>.
* lavf: Exporting opus pre_skip in AVCodecContextVignesh Venkatasubramanian2013-11-251-0/+1
| | | | | | | | | Opus Pre Skip is exported in AVCodecContext->delay similar to how it is done for matroska. Doing the same for ogg too. Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-250-0/+0
|\ | | | | | | | | | | | | | | * qatar/master: doc: Add the host executable suffix for the print_options dependency See: d48f014ff1db985fa3f74eddfb30bf513f99ff7a Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doc: Add the host executable suffix for the print_options dependencyMartin Storsjö2013-11-251-1/+1
| | | | | | | | | | | | This fixes building on windows. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avcodec/pthread: check packet buffer allocationHendrik Leppkes2013-11-251-0/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Partially revert "Merge commit 'f187557ab4612776f7f527ecf3d40062975c3e4c'"James Almer2013-11-252-3/+6
| | | | | | | | | | | | | | | | This partially reverts commit c0237d19a0269ff44e909434f1b2b645fad2d281 Some scripts make use of --disable-doc Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: do not call avcodec_register_all() explicitlyStefano Sabatini2013-11-251-1/+0
| | | | | | | | avcodec_register_all() is implicitly called by av_register_all().
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-242-1/+133
|\| | | | | | | | | | | | | * qatar/master: build: Import makedef script from c99-to-c89 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Import makedef script from c99-to-c89Derek Buitenhuis2013-11-242-1/+133
| | | | | | | | | | | | | | This allows MSVC 2013 and ICL to build with no external dependencies. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | avformat/asfdec: ignore packet_segmentsMichael Niedermayer2013-11-241-2/+1
| | | | | | | | | | | | | | Fixes Ticket1708 Based on patch by Alberto Delmás Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/asfdec: reset packet_time_start when asf_read_frame_header() failedAlberto Delmás2013-11-241-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/asfdec: remove duplicated packet_segments resetMichael Niedermayer2013-11-241-1/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/sdl: do not manually free window_title and icon_title fieldsStefano Sabatini2013-11-241-3/+0
| | | | | | | | They are automatically freed when calling av_write_trailer(). Simplify.
* | doc/outdevs/sdl: fix confusing text about window_fullscreen default valueStefano Sabatini2013-11-241-1/+1
| |
* | lavf/mpegenc: Print a warning if ac3, pcm_s16be or dts are muxed into mpeg1.Carl Eugen Hoyos2013-11-241-0/+9
| | | | | | | | | | Some media players don't play the resulting files. The warning should help users to avoid the issues described in ticket #1720.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-2437-1/+65
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Add missing #includes for *INT64_MAX and *INT64_C Conflicts: ffmpeg.c ffmpeg_filter.c ffplay.c libavformat/assdec.c libavformat/avidec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add missing #includes for *INT64_MAX and *INT64_CDiego Biurrun2013-11-2337-1/+64
| |
* | Merge commit '0eeeb9647e9c92c9edfd0b18c7cb5da7ac666f85'Michael Niedermayer2013-11-244-115/+143
|\| | | | | | | | | | | | | | | | | | | * commit '0eeeb9647e9c92c9edfd0b18c7cb5da7ac666f85': mpegaudiodec: Consistently handle fixed/float templating Conflicts: libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegaudiodec: Consistently handle fixed/float templatingDiego Biurrun2013-11-234-115/+143
| |
* | Merge commit '48b24bd2d208ce0f124029ac4c5ac5cb1fca4175'Michael Niedermayer2013-11-241-4/+3
|\| | | | | | | | | | | | | | | | | | | | | * commit '48b24bd2d208ce0f124029ac4c5ac5cb1fca4175': ac3dec: Fix out-of-array read Conflicts: libavcodec/ac3dec.c See: 2cbf27b08a4991de608b305a8600b59467587605 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ac3dec: Fix out-of-array readTim Walker2013-11-231-2/+3
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'f187557ab4612776f7f527ecf3d40062975c3e4c'Michael Niedermayer2013-11-242-7/+4
|\| | | | | | | | | | | | | | | | | | | | | * commit 'f187557ab4612776f7f527ecf3d40062975c3e4c': build: more fine-grained dependencies for documentation build tools Conflicts: configure doc/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: more fine-grained dependencies for documentation build toolsDiego Biurrun2013-11-232-6/+9
| | | | | | | | Perl is needed to build the manual pages, texi2html for the HTML pages.
* | avcodec/jpeg2000dec: Check precno before using it in JPEG2000_PGOD_CPRLMichael Niedermayer2013-11-241-0/+4
| | | | | | | | | | | | | | | | Fixes out of array reads Fixes: asan_heap-oob_f0de57_6823_mjp2.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffprobe: use designated initializer for AVClassPaul B Mahol2013-11-231-8/+7
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/vp9dsp: remove unused stride parameter in loop_filter().Clément Bœsch2013-11-231-3/+2
| | | | | | | | The stride argument is passed either as stridea or strideb.
* | avcodec/hnm4video: allocate frame only when theres a coded frameMichael Niedermayer2013-11-231-4/+6
| | | | | | | | | | | | | | | | | | | | | | Fixes memleak Fixes: asan_heap-oob_e76bdf_2224_MOTHOO.HNM This patch also removes the setting of palette_has_changed, which was set on a frame that was never returned Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libvpxenc: update cpu-used defaultJames Zern2013-11-231-1/+1
| | | | | | | | | | | | | | 3 -> 1. vp8 encoding speed has improved since the initial release and 1 is a reasonable default for vp9 as well. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libvpxdec: set CODEC_CAP_DR1 for vp9James Zern2013-11-231-1/+1
| | | | | | | | | | | | it shares vp8_decode() with vp8 which already has the flag set Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-231-1/+2
|\| | | | | | | | | | | | | | | | | | | * qatar/master: libschroedingerenc: do not assert on values from external libraries Conflicts: libavcodec/libschroedingerenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libschroedingerenc: do not assert on values from external librariesAlexandra Khirnova2013-11-231-5/+2
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'Michael Niedermayer2013-11-237-3/+364
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea': avconv: add support for VDPAU decoding Conflicts: Changelog Makefile configure ffmpeg.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: add support for VDPAU decodingAnton Khirnov2013-11-237-3/+365
| |
* | Merge commit '07fd0a22192805d56c635eb294dc26b0a54ae325'Michael Niedermayer2013-11-235-2/+179
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '07fd0a22192805d56c635eb294dc26b0a54ae325': avconv: add infrastructure for using hwaccels Conflicts: ffmpeg.c ffmpeg.h ffmpeg_filter.c ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: add infrastructure for using hwaccelsAnton Khirnov2013-11-235-2/+178
| |
* | Merge commit 'd4df02131b5522a99a4e6035368484e809706ed5'Michael Niedermayer2013-11-232-2/+0
|\| | | | | | | | | | | | | * commit 'd4df02131b5522a99a4e6035368484e809706ed5': ac3dec: Remove write-only channel_layout field from AC3DecodeContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ac3dec: Remove write-only channel_layout field from AC3DecodeContextTim Walker2013-11-222-2/+0
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | libavcodec/ac3dec: fix channel_layoutMichael Niedermayer2013-11-231-1/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b53285462263ef8a795f0e289abd5799b4c57652'Michael Niedermayer2013-11-232-13/+41
|\| | | | | | | | | | | | | * commit 'b53285462263ef8a795f0e289abd5799b4c57652': ac3: implement request_channel_layout. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ac3: implement request_channel_layout.Tim Walker2013-11-222-13/+41
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'c16bfb147df8a9d350e8a0dbc01937b78faf5949'Michael Niedermayer2013-11-232-17/+23
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'c16bfb147df8a9d350e8a0dbc01937b78faf5949': swscale: x86: Consistently use lowercase function name suffixes Conflicts: libswscale/x86/rgb2rgb.c libswscale/x86/swscale.c See: 1de064e21e7f1bbdd2347ba8967089a18669fcf8 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: x86: Consistently use lowercase function name suffixesDiego Biurrun2013-11-223-24/+30
| |
* | Add --enable-rpath option to add -Wl,-rpath to pkg-config files.Reimar Döffinger2013-11-231-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | This allows installing into e.g. /usr/lib/ffmpeg and binaries linked against ffmpeg will pick these .so file while binaries linked against some fork or different version will pick the libraries in /usr/lib. There will be still some issues for binaries that (indirectly) end up depending on multiple variants, but for the simpler cases it should allow different applications to use different (compatible) variants that are installed at the same time. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | avcodec/hnm4video: check writeoffset in decode_interframe_v4a()Michael Niedermayer2013-11-221-0/+8
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/hnm: check chunk_size == 0Michael Niedermayer2013-11-221-1/+1
| | | | | | | | | | | | Fixes potential infinite loop Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/hnm4video: check dimensions for validityMichael Niedermayer2013-11-221-1/+3
| | | | | | | | | | | | | | Fixes out of array read Fixes: asan_heap-oob_e76e18_1244_CASSE.HNM Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>