summaryrefslogtreecommitdiff
path: root/libavformat/avidec.c
Commit message (Collapse)AuthorAge
* avformat/avidec: Fix incorrect detection of badly interleaved aviNigel Touati-Evans2013-07-05
| | | | | | | 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-17
| | | | | | 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-13
| | | | Fixes ticket #2561.
* avidec: Enable full parsing for potencoder mpeg1/2Michael Niedermayer2013-05-10
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'Michael Niedermayer2013-05-05
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-04
| |
* | avidec: Fix demuxing of non seekable avis with multiple RIFFsMichael Niedermayer2013-03-28
| | | | | | | | | | | | | | | | 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-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1afddbe59e96af75f1c07605afc95615569f388f'Michael Niedermayer2013-03-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-08
| | | | | | | | | | | | This will allow us to avoid copying the packets in many cases. This breaks ABI.
* | avformat: Allocate duration_error separatelyMichael Niedermayer2013-02-23
| | | | | | | | | | | | | | 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-22
|\| | | | | | | | | | | | | | | | | | | * 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-21
| | | | | | | | | | | | | | | | 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-12
| | | | | | | | | | 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-30
| | | | | | | | Fixes ticket #1797.
* | avidec: try to support oddly muxed MMES streamMichael Niedermayer2012-11-22
| | | | | | | | | | | | Fixes ticket1804 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avidec: remove unneeded null checkMichael Niedermayer2012-10-19
| | | | | | | | | | 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-14
| | | | | | | | | | | | 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-12
| | | | | | | | | | | | | | | | | | | | | | | | | | #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-10
| | | | | | | | | | Mostly based on 73ad355 by Michael Niedermayer. Fixes ticket #606.
* | avidec: fix 10l typoMichael Niedermayer2012-10-10
| | | | | | | | | | found-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avidec: override sample size of 1024 for VBR AACMichael Niedermayer2012-10-10
| | | | | | | | | | | | Fixes Ticket1755 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-01
| |
| * avformat: Remove non-compiling and/or silly commented-out printf/av_log ↵Diego Biurrun2012-10-01
| | | | | | | | statements
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-09-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-29
| | | | | | | | Fixes CVE-2012-2788
| * avidec: return 0, not packet size from read_packet().Anton Khirnov2012-09-29
| |
* | avidec: workaround aac with broken block alignMichael Niedermayer2012-09-18
| | | | | | | | | | | | | | Fixes Ticket1742 Based on patch by: Nikola Vranic <nikola.vranic@rt-rk.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avidec/guess_ni_flag: fix harmless integer overflowMichael Niedermayer2012-09-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'Michael Niedermayer2012-09-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9': avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member Conflicts: libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libx264.c libavcodec/mpeg12enc.c libavcodec/options_table.h libavcodec/snowenc.c libavcodec/tiffenc.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/af_amix.c libavfilter/af_asyncts.c libavfilter/af_join.c libavfilter/buffersrc.c libavfilter/src_movie.c libavfilter/vf_delogo.c libavfilter/vf_drawtext.c libavformat/http.c libavformat/img2dec.c libavformat/img2enc.c libavformat/movenc.c libavformat/mpegenc.c libavformat/mpegtsenc.c libavformat/options_table.h libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: add missing new line to some error messagesPiotr Bandurski2012-09-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc: move AVRn to a seperate decoder.Michael Niedermayer2012-08-20
| | | | | | | | | | | | | | The special cases in demuxers and decoders are a mess otherwise (and more would be needed to support it fully) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer2012-08-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '36ef5369ee9b336febc2c270f8718cec4476cb85': Replace all CODEC_ID_* with AV_CODEC_ID_* lavc: add AV prefix to codec ids. Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/examples/muxing.c ffmpeg.c ffprobe.c ffserver.c libavcodec/8svx.c libavcodec/avcodec.h libavcodec/dnxhd_parser.c libavcodec/dvdsubdec.c libavcodec/error_resilience.c libavcodec/h263dec.c libavcodec/libvorbisenc.c libavcodec/mjpeg_parser.c libavcodec/mjpegenc.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pcm.c libavcodec/r210dec.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/version.h libavdevice/alsa-audio-dec.c libavdevice/bktr.c libavdevice/v4l2.c libavformat/asfdec.c libavformat/asfenc.c libavformat/avformat.h libavformat/avidec.c libavformat/caf.c libavformat/electronicarts.c libavformat/flacdec.c libavformat/flvdec.c libavformat/flvenc.c libavformat/framecrcenc.c libavformat/img2.c libavformat/img2dec.c libavformat/img2enc.c libavformat/ipmovie.c libavformat/isom.c libavformat/matroska.c libavformat/matroskadec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/movenc.c libavformat/mp3dec.c libavformat/mpeg.c libavformat/mpegts.c libavformat/mxf.c libavformat/mxfdec.c libavformat/mxfenc.c libavformat/nsvdec.c libavformat/nut.c libavformat/oggenc.c libavformat/pmpdec.c libavformat/rawdec.c libavformat/rawenc.c libavformat/riff.c libavformat/sdp.c libavformat/utils.c libavformat/vocenc.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace all CODEC_ID_* with AV_CODEC_ID_*Anton Khirnov2012-08-07
| |
* | avidec: fix AVStream.info memleak with dv.Michael Niedermayer2012-08-07
| | | | | | | | | | | | Fixes Ticket1334 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avidec: parse INFO tags at the endMichael Niedermayer2012-08-06
| | | | | | | | | | | | Fixes Ticket1123 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-31
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mpc8: return more meaningful error codes. mpc: return more meaningful error codes. wv,mpc8: don't return apetag data in packets. rtmp: do not warn about receiving metadata packets x86: h264dsp: Adjust YASM #ifdefs x86: yadif: Mark mmxext optimizations as such h264: convert loop filter strength dsp function to yasm. Improve descriptiveness of a number of codec and container long names Conflicts: libavcodec/flvdec.c libavcodec/libopenjpegdec.c libavformat/apetag.c libavformat/mp3dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Improve descriptiveness of a number of codec and container long namesDiego Biurrun2012-07-30
| |
* | avidec: Mark first frame as keyframe in case there are no keyframes.Michael Niedermayer2012-07-19
| | | | | | | | | | | | This fixes seeking in filecopy.avi of Ticket504 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avidec: switch to av_assertMichael Niedermayer2012-07-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avidec: add .categoryPaul B Mahol2012-06-19
| | | | | | | | | | | | While here make .class_name consistent with other AVClass. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avidec: use designated initializers for AVClassPaul B Mahol2012-06-19
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: movenc: Write chan atom for all audio tracks in mov mode movies. mpegtsenc: use avio_open_dyn_buf(), zero pointers after freeing doc/avconv: add some details about the transcoding process. avidec: make scale and rate unsigned. avconv: check output stream recording time before each frame returned from filters avconv: split selecting input file out of transcode(). avconv: split checking for active outputs out of transcode(). avfiltergraph: make some functions static. Conflicts: ffmpeg.c libavfilter/avfiltergraph.c libavfilter/internal.h libavformat/mpegtsenc.c tests/ref/fate/acodec-alac tests/ref/fate/acodec-pcm-s16be tests/ref/fate/acodec-pcm-s24be tests/ref/fate/acodec-pcm-s32be tests/ref/fate/acodec-pcm-s8 tests/ref/lavf/mov Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avidec: make scale and rate unsigned.Anton Khirnov2012-06-04
| | | | | | | | The specs say they are unsigned 32bit integers.
* | avidec: fix odd extradata size case.Michael Niedermayer2012-05-31
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavformat: ff_get_bmp_header: return esize tooMichael Niedermayer2012-05-31
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avidec: simplify avi_read_idx1()Michael Niedermayer2012-05-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avidec: discard 0 packets even for sample_size==0 NIMichael Niedermayer2012-05-23
| | | | | | | | | | | | Fixes Ticket1332 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avidec: zero extradata paddingMichael Niedermayer2012-04-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>