Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-06-04avformat/avidec: allow rounding errors between scale/rate and timebaseMichael Niedermayer
Fixes Ticket3670 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-01avformat/avidec: set average frame rate from headerMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-27Fix dont and doesnt typosMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-27Fix skiping typosMichael Niedermayer
Found-by: Alessandro Ghedini <alessandro@ghedini.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-25avformat/avidec: skip len=0 entries from the indexDon Moir
Reduces cpu & memory requirements for the index See Ticket 3531 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-22avformat/avidec: Speed up keyframe detection codeMichael Niedermayer
Fixes Ticket3531 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-05lavf/avidec: Read metadata EXIF tags from AVIF tag. Based on patch by ↵Thilo Borgmann
Gregory Wolfe (Kodak Alaris) <gregory.wolfe@kodakalaris.com>. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-02avformat/avidec: remove unused variablesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-02Merge commit '9d599e3f6e61438772d8cddd6c9b7c495251f51e'Michael Niedermayer
* commit '9d599e3f6e61438772d8cddd6c9b7c495251f51e': avi: Improve non-interleaved detection Conflicts: libavformat/avidec.c See: 8df774be88c347c40f1b2411ed9e391dfec0ebb7 and others Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-02avi: Improve non-interleaved detectionMichael Niedermayer
Additional fixes by Nigel Touati-Evans <nigel.touatievans@gmail.com>. Check the index for streams with a time drift of 2s or a buffer drift of 64MB. Bug-Id: 666 CC: libav-stable@libav.org Sample-Id: yet-another-broken-interleaved-avi.avi Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-04-02Merge commit 'f1c4a54f6ecbf77a29aaaee09ca70c5468d0c509'Michael Niedermayer
* commit 'f1c4a54f6ecbf77a29aaaee09ca70c5468d0c509': lavf: add supported extension to avi and mov demuxers Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-02lavf: add supported extension to avi and mov demuxersMarc-Antoine Arnaud
2014-03-12Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'Michael Niedermayer
* commit 'd92024f18fa3d69937cb2575f3a8bf973df02430': lavf: more correct printf format specifiers Conflicts: libavformat/asfdec.c libavformat/cafdec.c libavformat/dxa.c libavformat/framecrcenc.c libavformat/hnm.c libavformat/iff.c libavformat/mov.c libavformat/mxfdec.c libavformat/rmdec.c libavformat/rpl.c libavformat/smacker.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-11avformat/avidec: Check required demuxing buffer sizes in guess_ni_flag()Michael Niedermayer
Fixes Ticket3421 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-11avidec: calculate missing bitrates from indexMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-11lavf: more correct printf format specifiersDiego Biurrun
2014-03-02avformat/avidec: Use a buffer with sufficient padding in read_gab2_sub()Michael Niedermayer
Fixes out of array read Fixes: 0ff9841c2a102f06e0d582bfc3376cbd-asan_heap-oob_495589_6836_cov_1763916974_mewmew_ssa.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-20Avoid a possible overflow when reading Nikon avi files.Carl Eugen Hoyos
Suggested-by: Reimar
2014-01-20Allow decoding of slightly broken Nikon avi files.Carl Eugen Hoyos
Fixes ticket #3330.
2014-01-08Use the h264 parser when decoding VSSH in avi.Carl Eugen Hoyos
Fixes ticket #3261 visually. Analyzed-by: Michael Doilnitsyn
2013-12-25avformat/avidec: use ff_get_extradata()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-24Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* 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>
2013-11-24Add missing #includes for *INT64_MAX and *INT64_CDiego Biurrun
2013-11-22avformat/avidec: Dont assert the existence of an index for video streams.Michael Niedermayer
Its possible in various rare cases that an index cannot be created or allocated. Fixes assertion failure Fixes: signal_sigabrt_7ffff7126425_7712_pokem.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-22avformat/avidec: Skip duplicate strf chunksMichael Niedermayer
Fixes Ticket3119 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-22avformat/avidec: also print position in print_tag()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-21avidec: fix a memleak in the dv init code.Anton Khirnov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org
2013-10-14avformat: use ff_alloc_extradata()Paul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-10Merge commit 'ceec6e792e4b5baaa23b220f4fd33417631f5288'Michael Niedermayer
* commit 'ceec6e792e4b5baaa23b220f4fd33417631f5288': avi: directly resync on DV in AVI read failure Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10Merge commit '756547ce7f4d67a18663503e2157aebed3531703'Michael Niedermayer
* commit '756547ce7f4d67a18663503e2157aebed3531703': avi: DV in AVI must be considered single stream Conflicts: libavformat/avidec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10Merge commit '1cac9accbd1f9b8596122d0735e37b97a844c514'Michael Niedermayer
* commit '1cac9accbd1f9b8596122d0735e37b97a844c514': avi: properly fail if the dv demuxer is missing Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10avi: directly resync on DV in AVI read failureLuca Barbato
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
2013-10-10avi: DV in AVI must be considered single streamLuca Barbato
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
2013-10-10avi: properly fail if the dv demuxer is missingLuca Barbato
CC: libav-stable@libav.org
2013-09-30Merge commit '8d07258bb6063d0780ce2d39443d6dc6d8eedc5a'Michael Niedermayer
* commit '8d07258bb6063d0780ce2d39443d6dc6d8eedc5a': avidec: Make sure a packet is large enough before reading its data Conflicts: libavformat/avidec.c See: 028cc42a1638e6f93a857f11c2568d1c3a51e612 Note: data!=NULL implies that the allocated array is at least FF_INPUT_BUFFER_PADDING_SIZE large Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-29avidec: Make sure a packet is large enough before reading its dataMartin Storsjö
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-27Merge commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9'Michael Niedermayer
* commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9': lavf: Reset the entry count and allocation size variables on av_reallocp failures Conflicts: libavformat/avienc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-27lavf: Reset the entry count and allocation size variables on av_reallocp ↵Martin Storsjö
failures When av_reallocp fails, the associated variables that keep track of the number of elements in the array (and in some cases, the separate number of allocated elements) need to be reset. Not all of these might technically be needed, but it's better to reset them if in doubt, to make sure variables don't end up conflicting. Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-19Merge commit '5626f994f273af80fb100d4743b963304de9e05c'Michael Niedermayer
* commit '5626f994f273af80fb100d4743b963304de9e05c': avformat: Use av_reallocp() where suitable Conflicts: libavformat/avidec.c libavformat/avienc.c libavformat/aviobuf.c libavformat/oggparsevorbis.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-18avformat: Use av_reallocp() where suitableAlexandra Khirnova
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-09-16avformat/avidec: use av_calloc() and check for allocation errorPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-08avformat/avidec: fix signedness of pointer type in get_stream_idx()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-31avformat/avidec: match first index and first packet size=0 handlingMichael Niedermayer
Fixes Ticket2861 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-03Merge commit '7950e519bb094897f957b9a9531cc60ba46cbc91'Michael Niedermayer
* commit '7950e519bb094897f957b9a9531cc60ba46cbc91': Disable deprecation warnings for cases where a replacement is available Conflicts: libavcodec/avpacket.c libavcodec/pthread.c libavcodec/utils.c libavdevice/v4l2.c libavfilter/avfiltergraph.c libavfilter/buffersrc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-02Disable deprecation warnings for cases where a replacement is availableDiego Biurrun
2013-07-28Merge commit 'c8f0b20b4a6bb6691928789d83e4b02896969848'Michael Niedermayer
* commit 'c8f0b20b4a6bb6691928789d83e4b02896969848': avidec: Let the inner dv demuxer take care of discarding Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-28Merge commit '10aa44aa675e05067845e3e55fac37642cbbdae4'Michael Niedermayer
* commit '10aa44aa675e05067845e3e55fac37642cbbdae4': avidec: K&R formatting cosmetics Conflicts: libavformat/avidec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-27avidec: Let the inner dv demuxer take care of discardingLuca Barbato
CC: libav-stable@libav.org
2013-07-27avidec: K&R formatting cosmeticsLuca Barbato
Signed-off-by: Diego Biurrun <diego@biurrun.de> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-07-06avformat/avidec: Fix incorrect detection of badly interleaved aviNigel Touati-Evans
The method guess_ni_flag needs to divide timestamps in the index by sample_size if it is set in order to compare different streams correctly. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>