summaryrefslogtreecommitdiff
path: root/libavformat/avidec.c
Commit message (Collapse)AuthorAgeFilesLines
* avformat: use ff_alloc_extradata()Paul B Mahol2013-10-131-10/+2
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* Merge commit 'ceec6e792e4b5baaa23b220f4fd33417631f5288'Michael Niedermayer2013-10-101-0/+2
|\ | | | | | | | | | | | | * commit 'ceec6e792e4b5baaa23b220f4fd33417631f5288': avi: directly resync on DV in AVI read failure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avi: directly resync on DV in AVI read failureLuca Barbato2013-10-101-0/+2
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit '756547ce7f4d67a18663503e2157aebed3531703'Michael Niedermayer2013-10-101-2/+7
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '756547ce7f4d67a18663503e2157aebed3531703': avi: DV in AVI must be considered single stream Conflicts: libavformat/avidec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avi: DV in AVI must be considered single streamLuca Barbato2013-10-101-3/+7
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit '1cac9accbd1f9b8596122d0735e37b97a844c514'Michael Niedermayer2013-10-101-1/+2
|\ \ | |/ | | | | | | | | | | * commit '1cac9accbd1f9b8596122d0735e37b97a844c514': avi: properly fail if the dv demuxer is missing Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avi: properly fail if the dv demuxer is missingLuca Barbato2013-10-101-1/+2
| | | | | | | | CC: libav-stable@libav.org
* | Merge commit '8d07258bb6063d0780ce2d39443d6dc6d8eedc5a'Michael Niedermayer2013-09-291-1/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * 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>
| * avidec: Make sure a packet is large enough before reading its dataMartin Storsjö2013-09-291-1/+2
| | | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9'Michael Niedermayer2013-09-271-2/+3
|\ \ | |/ | | | | | | | | | | | | | | | | * 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>
| * lavf: Reset the entry count and allocation size variables on av_reallocp ↵Martin Storsjö2013-09-261-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge commit '5626f994f273af80fb100d4743b963304de9e05c'Michael Niedermayer2013-09-191-5/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * avformat: Use av_reallocp() where suitableAlexandra Khirnova2013-09-181-4/+5
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | avformat/avidec: use av_calloc() and check for allocation errorPaul B Mahol2013-09-161-1/+3
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat/avidec: fix signedness of pointer type in get_stream_idx()Michael Niedermayer2013-09-081-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avidec: match first index and first packet size=0 handlingMichael Niedermayer2013-08-311-1/+1
| | | | | | | | | | | | Fixes Ticket2861 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '7950e519bb094897f957b9a9531cc60ba46cbc91'Michael Niedermayer2013-08-031-0/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Disable deprecation warnings for cases where a replacement is availableDiego Biurrun2013-08-021-0/+5
| |
* | Merge commit 'c8f0b20b4a6bb6691928789d83e4b02896969848'Michael Niedermayer2013-07-281-3/+6
|\ \ | |/ | | | | | | | | | | * commit 'c8f0b20b4a6bb6691928789d83e4b02896969848': avidec: Let the inner dv demuxer take care of discarding Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avidec: Let the inner dv demuxer take care of discardingLuca Barbato2013-07-271-3/+6
| | | | | | | | CC: libav-stable@libav.org
* | Merge commit '10aa44aa675e05067845e3e55fac37642cbbdae4'Michael Niedermayer2013-07-281-466/+564
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '10aa44aa675e05067845e3e55fac37642cbbdae4': avidec: K&R formatting cosmetics Conflicts: libavformat/avidec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avidec: K&R formatting cosmeticsLuca Barbato2013-07-271-443/+536
| | | | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avformat/avidec: Fix incorrect detection of badly interleaved aviNigel Touati-Evans2013-07-051-2/+3
| | | | | | | | | | | | | | 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>
* | avidec: dont randomly skip packets for offseting the indexMichael Niedermayer2013-05-171-2/+2
| | | | | | | | | | | | Fixes Ticket2490 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Do not read strd chunk in avi files as H264 extradata.Carl Eugen Hoyos2013-05-131-1/+3
| | | | | | | | Fixes ticket #2561.
* | avidec: Enable full parsing for potencoder mpeg1/2Michael Niedermayer2013-05-101-0/+11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'Michael Niedermayer2013-05-051-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e0f8be6413b6a8d334d6052e610af32935c310af': avformat: Add AVPROBE_SCORE_EXTENSION define and use where appropriate Conflicts: libavformat/ac3dec.c libavformat/avformat.h libavformat/avs.c libavformat/m4vdec.c libavformat/mov.c libavformat/mp3dec.c libavformat/mpeg.c libavformat/mpegvideodec.c libavformat/psxstr.c libavformat/pva.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Add AVPROBE_SCORE_EXTENSION define and use where appropriateDiego Biurrun2013-05-041-1/+1
| |
* | avidec: Fix demuxing of non seekable avis with multiple RIFFsMichael Niedermayer2013-03-281-1/+1
| | | | | | | | | | | | | | | | This solution uses the size of the first RIFF if its valid to check frame size validity when the filesize could not be determined. Feedback is welcome, other ideas and improvments as well! Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avidec: fix duration and bitrate of truncated filesMichael Niedermayer2013-03-191-2/+8
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1afddbe59e96af75f1c07605afc95615569f388f'Michael Niedermayer2013-03-081-0/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1afddbe59e96af75f1c07605afc95615569f388f': avpacket: use AVBuffer to allow refcounting the packets. Conflicts: libavcodec/avpacket.c libavcodec/utils.c libavdevice/v4l2.c libavformat/avidec.c libavformat/flacdec.c libavformat/id3v2.c libavformat/matroskaenc.c libavformat/mux.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avpacket: use AVBuffer to allow refcounting the packets.Anton Khirnov2013-03-081-0/+8
| | | | | | | | | | | | This will allow us to avoid copying the packets in many cases. This breaks ABI.
* | avformat: Allocate duration_error separatelyMichael Niedermayer2013-02-231-0/+2
| | | | | | | | | | | | | | This significantly reduces the memory needed per AVStream when the array is not needed. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '570a4a0189946c2c983da41d37fdd67fa13266e7'Michael Niedermayer2013-01-221-18/+20
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '570a4a0189946c2c983da41d37fdd67fa13266e7': avidec: use sensible error codes instead of -1 Conflicts: libavformat/avidec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avidec: use sensible error codes instead of -1Jindrich Makovicka2013-01-211-19/+22
| | | | | | | | | | | | | | | | Use AVERROR_INVALIDDATA on invalid inputs, and AVERROR_EOF when no more frames are available in an interleaved AVI. Signed-off-by: Jindrich Makovicka <makovick@gmail.com> Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | read_gab2_sub: fix null pointer dereferenceMichael Niedermayer2012-12-121-1/+1
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Correctly skip strf tag for subtitles when decoding avi.Carl Eugen Hoyos2012-11-301-0/+1
| | | | | | | | Fixes ticket #1797.
* | avidec: try to support oddly muxed MMES streamMichael Niedermayer2012-11-221-0/+5
| | | | | | | | | | | | Fixes ticket1804 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avidec: remove unneeded null checkMichael Niedermayer2012-10-191-1/+1
| | | | | | | | | | Fixes CID29555 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avoid more "0xFF << 24" as it is considered a integer overflow in C99Michael Niedermayer2012-10-141-2/+2
| | | | | | | | | | | | missed these in my previous search and replace Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avidec: Use sample size in case incorrect timestamps for aac in AVI (Ticket ↵Heesuk Jung2012-10-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | #1755) In some case for aac in AVI, avidec extracts wrong PTS value. (www.ffmpeg.org/trac/ffmpeg/ticket/1755) I found additional case(ss=4096) and add condition. Problematic file link : https://docs.google.com/open?id=0B6r7ZfWFIypCOTdZQUtGVEdJUUE Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix broken timestamps for some mp3 in avi samples.Carl Eugen Hoyos2012-10-101-1/+2
| | | | | | | | | | Mostly based on 73ad355 by Michael Niedermayer. Fixes ticket #606.
* | avidec: fix 10l typoMichael Niedermayer2012-10-101-1/+1
| | | | | | | | | | found-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avidec: override sample size of 1024 for VBR AACMichael Niedermayer2012-10-101-0/+4
| | | | | | | | | | | | Fixes Ticket1755 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-011-10/+14
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avcodec: Convert some commented-out printf/av_log instances to av_dlog avcodec: Drop silly and/or broken printf debug output avcodec: Drop some silly commented-out av_log() invocations avformat: Convert some commented-out printf/av_log instances to av_dlog avformat: Remove non-compiling and/or silly commented-out printf/av_log statements Remove some silly disabled code. ac3dec: ensure get_buffer() gets a buffer for the correct number of channels Conflicts: libavcodec/dnxhddec.c libavcodec/ffv1.c libavcodec/h264.c libavcodec/h264_parser.c libavcodec/mjpegdec.c libavcodec/motion_est_template.c libavcodec/mpegaudiodec.c libavcodec/mpegvideo_enc.c libavcodec/put_bits.h libavcodec/ratecontrol.c libavcodec/wmaenc.c libavdevice/timefilter.c libavformat/asfdec.c libavformat/avidec.c libavformat/avienc.c libavformat/flvenc.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Convert some commented-out printf/av_log instances to av_dlogDiego Biurrun2012-10-011-7/+16
| |
| * avformat: Remove non-compiling and/or silly commented-out printf/av_log ↵Diego Biurrun2012-10-011-4/+0
| | | | | | | | statements
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-09-291-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: wmalosslessdec: increase channel_coeffs/residues size wmalosslessdec: increase WMALL_BLOCK_MAX_BITS to 14. lagarith: check count before writing zeros. wmaprodec: check num_vec_coeffs for validity avidec: use actually read size instead of requested size avidec: return 0, not packet size from read_packet(). Conflicts: libavcodec/lagarith.c libavcodec/wmalosslessdec.c libavcodec/wmaprodec.c libavformat/avidec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avidec: use actually read size instead of requested sizeAnton Khirnov2012-09-291-1/+1
| | | | | | | | Fixes CVE-2012-2788
| * avidec: return 0, not packet size from read_packet().Anton Khirnov2012-09-291-1/+1
| |
View Lorry Controller Status