summaryrefslogtreecommitdiff
path: root/libavformat/mov.c
Commit message (Collapse)AuthorAge
* mov_probe: use correct variableMichael Niedermayer2012-10-25
| | | | | Fixes CID739867 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Do not detect mov with maximum score if the atom size is too small.Carl Eugen Hoyos2012-10-23
| | | | Fixes mpegts-in-mov, ticket #987 / issue 2223.
* Improve MPEG-PS-in-MOV detection.Carl Eugen Hoyos2012-10-21
| | | | Fixes issue 1520.
* bavformat/mov: add {} to complex ifsMichael Niedermayer2012-10-21
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mov.c: Check for stsd + m1s tag indicating MOV-wrapped MPEG-PS, and force ↵Petter Ericson2012-10-19
| | | | | | | continued probing if found. Fixes Ticket241 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mov_probe: fix integer overflowsMichael Niedermayer2012-10-17
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mov: fix time types related to mov_metadata_creation_timeMichael Niedermayer2012-10-17
| | | | | | Fixes Ticket1817 Based on patch by: Przemyslaw Wesolek <przemyslaw.wesolek@go.art.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mov: print warning if ff_get_wav_header() failsMichael Niedermayer2012-10-16
| | | | | Fixes CID717497 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mov: fix integer avoption typesMichael Niedermayer2012-10-07
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mov: add option to ignore edit lists.Michael Niedermayer2012-10-02
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mov: add av_dlog() to dump edit lists.Michael Niedermayer2012-09-29
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mov: only print multiple edit lists warning for actually unsupported casesMichael Niedermayer2012-09-29
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mov: remove default of 1024 sample skip for aac.Michael Niedermayer2012-09-28
| | | | | | | It is not correct in all cases and it is less predictable than a skip of 0 for user applications. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-09-20
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mp3dec: read Xing frame TOC index mp3dec: use named constants for Xing header flags libx264: add support for nal-hrd, required for Blu-ray streams. mov: support random access point grouping matroskadec: properly support BlockDuration Conflicts: libavcodec/libx264.c libavformat/isom.h libavformat/matroskadec.c libavformat/mov.c libavformat/mp3dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: support random access point groupingYusuke Nakamura2012-09-19
| | | | | | | | | | | | | | | | | | Frames described by this grouping are the starter of a closed or an open GOP. This is useful for open GOP of H.264 stream which is not described by sync sample atom. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | mov: fix 32/64 format typeMichael Niedermayer2012-09-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1b3439b3055b083df51d7f7838ecc6b3f708b15c'Michael Niedermayer2012-09-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1b3439b3055b083df51d7f7838ecc6b3f708b15c': mpegvideo: move frame size dependent memory management to separate functions configure: add --toolchain option configure: Make the smoothstreaming muxer enable the ismv muxer smoothstreaming: Export the mp4 codec tags mov: check for EOF in long lasting loops avcodec: cleanup utils.c binkaudio: remove unneeded GET_BITS_SAFE macro binkaudio: use float sample format binkaudio: use a different value for the coefficient scale for the DCT codec Conflicts: configure libavcodec/mpegvideo.c libavcodec/utils.c libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: check for EOF in long lasting loopsLuca Barbato2012-09-18
| | | | | | | | | | | | | | A quite widespread pattern in the demuxer is read a 32bit unsigned integer and then loop till this value is reached. Checking for EOF prevents pathological situations.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-09-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avconv: flush filtered frames before reconfiguring filters mov: stsd entries must be at least 16 byte mov: detect EOF in mov_read_dref() file: return proper error on seek failures Conflicts: libavformat/file.c libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: stsd entries must be at least 16 byteMichael Niedermayer2012-09-16
| | | | | | | | | | | | | | | | | | | | Fix near infinite loop in stsd parsing. Bug found by: Diana Elena Muscalu The size is unsigned according the specification. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * mov: detect EOF in mov_read_dref()Michael Niedermayer2012-09-16
| | | | | | | | | | | | | | | | Avoid a near infinite loop. Issue discovered by cosminamironesei. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-09-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mov_chan: Pass a separate AVIOContext for reading af_asyncts: check return value from lavr when flushing. mss2: simplify loop in decode_rle() mss12: avoid unnecessary division in arith*_get_bit() mss2: do not try to read too many palette entries mpegvideo: set AVFrame fields to NULL after freeing the base memory configure: Set the right cc_e flags for msvc Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov_chan: Pass a separate AVIOContext for readingSamuel Pitoiset2012-09-07
| | | | | | | | | | | | | | This fixes crashes when called from rtpdec_qt, where AVFormatContext->pb is null, a crash present since 3bab7cd128. Signed-off-by: Martin Storsjö <martin@martin.st>
* | lavf: add missing new line to some error messages 2Piotr Bandurski2012-09-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mov: fix av_log int typeMichael Niedermayer2012-08-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mov: Change default aac priming fallback from 2112 to 1024Justin Greer2012-08-21
| | | | | | | | | | | | This fixes priming for faac Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mov: parse custom "----" MetadataJustin Greer2012-08-21
| | | | | | | | | | | | | | This fixes the priming samples for NERO AAC LC Simplified-by: Michael Niedermayer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | movdec: Try to recover from overreading atomsMichael Niedermayer2012-08-15
| | | | | | | | | | | | Fixes Ticket1596 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mov: remux AALP tagPiotr Bandurski2012-08-12
| | | | | | | | | | | | AALP(AALP001) tag is present in 32bpp files encoded with avid codecs Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mov: add av_dlog() to CTTS reading code like is already done in STTS.Michael Niedermayer2012-08-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | rename missed CodecID to AVCodecIDMichael Niedermayer2012-08-07
| | | | | | | | 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
| |
* | mov: dont clip timestamps at 0Michael Niedermayer2012-08-06
| | | | | | | | | | | | Fixes Ticket1251 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | movenc: fix remuxing of svq3Piotr Bandurski2012-08-05
| |
* | 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
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: flvdec: remove spurious use of stream id lavf: deprecate r_frame_rate. lavf: round estimated average fps to a "standard" fps. Conflicts: ffmpeg.c ffprobe.c libavformat/avformat.h libavformat/electronicarts.c libavformat/flvdec.c libavformat/rawdec.c libavformat/utils.c tests/ref/fate/iv8-demux Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: deprecate r_frame_rate.Anton Khirnov2012-07-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to its description, it is supposed to be the LCM of all the frame durations. The usability of such a thing is vanishingly small, especially since we cannot determine it with any amount of reliability. Therefore get rid of it after the next bump. Replace it with the average framerate where it makes sense. FATE results for the wtv and xmv demux tests change. In the wtv case this is caused by the file being corrupted (or possibly badly cut) and containing invalid timestamps. This results in lavf estimating the framerate wrong and making up wrong frame durations. In the xmv case the file contains pts jumps, so again the estimated framerate is far from anything sane and lavf again makes up different frame durations. In some other tests lavf starts making up frame durations from different frame.
* | Fix avui stream-copy.Carl Eugen Hoyos2012-07-25
| | | | | | | | | | | | The native decoder and MPlayer's binary decoder only need the APRG atom, QuickTime at least requires also the ARES atom and four additional 0 bytes padding at the end of stsd.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (38 commits) alac: cosmetics: general pretty-printing and comment clean up alac: calculate buffer size outside the loop in allocate_buffers() alac: change some data types to plain int alac: cosmetics: rename some variables and function names alac: multi-channel decoding support alac: split element parsing into a separate function alac: support a read sample size of up to 32 alac: output in planar sample format alac: add 32-bit decoding support alac: simplify channel interleaving alac: use AVPacket fields directly in alac_decode_frame() alac: fix check for valid max_samples_per_frame alac: use get_sbits() to read LPC coefficients instead of casting alac: move the current samples per frame to the ALACContext alac: avoid using a double-negative when checking if the frame is compressed alac: factor out output_size check in predictor_decompress_fir_adapt() alac: factor out loading of next decoded sample in LPC prediction alac: use index into buffer_out instead of incrementing the pointer alac: simplify lpc coefficient adaptation alac: reduce the number of local variables needed in lpc prediction ... Conflicts: libavcodec/alac.c libavformat/cafdec.c libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: move 'chan' tag parsing to mov_chan.c to share with the CAF demuxerJustin Ruggles2012-07-19
| |
* | mov/aac: skip initial aac paddingMichael Niedermayer2012-07-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (29 commits) lavfi: reclassify showfiltfmts as a TESTPROG graph2dot: fix printf format specifier swscale: yuv2planeX 8bit >=sse2 functions need aligned stack on x86-32. vp8: loopfilter >=sse2 functions need aligned stack on x86-32. amr: remove shift out of the AMR_BIT() macro. dsputilenc: group yasm and inline asm function pointer assignment. mov: use forward declaration of a function instead of a table. Clarify Doxygen comment for FF_API_* #defines. configure: simplify get_version() Create version.h headers for libraries that lack them gitignore: Use full path instead of relative path to specify patterns mpegvideo: remove VLAs Add XTEA encryption support in libavutil Add Blowfish encryption support in libavutil eval: Add the isinf() function and tests for it flacdec: move lpc filter to flacdsp flacdec: split off channel decorrelation as flacdsp avplay: Add an option for not limiting the input buffer size FATE: add a test for WMA cover art. FATE: add a test for apetag cover art ... Conflicts: .gitignore configure ffplay.c libavcodec/Makefile libavcodec/error_resilience.c libavcodec/mpegvideo.c libavcodec/ratecontrol.c libavdevice/avdevice.h libavfilter/Makefile libavfilter/filtfmts.c libavfilter/version.h libavformat/mov.c libavformat/version.h libavutil/Makefile libavutil/avutil.h libavutil/version.h libswscale/swscale.h libswscale/x86/swscale_mmx.c tests/fate/libavutil.mak tests/lavfi-regression.sh tools/graph2dot.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: use forward declaration of a function instead of a table.Ronald S. Bultje2012-07-04
| | | | | | | | | | MSVC gives a compile error on the tentative definition of mov_default_parse_table[].
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-02
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: asfdec: read attached pictures. apetag: reindent apetag: export attached covers as video streams. apetag: fix the amount of data read from binary tags. apetag: make sure avio_get_str() doesn't read more than it should. mov: read itunes cover art. snow: remove VLA in mc_block() intfloat: Don't use designated initializers in the public headers snow: remove a VLA. doc: Remind devs to check return values, especially for malloc() et al MS ATC Screen (aka MSS3) decoder vf_yadif: move x86 init code to x86/yadif.c vf_gradfun: move x86 init code to x86/gradfun.c roqvideo: Remove a totally unused dspcontext smacker: remove some unused code dsicin: remove dead assignment aacdec: remove dead assignment rl2: remove dead assignment proresenc: make a variable local to the loop where it is used alsdec: remove dead assignments Conflicts: Changelog doc/developer.texi libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/version.h libavfilter/gradfun.h libavfilter/x86/gradfun.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: read itunes cover art.Anton Khirnov2012-07-02
| |
| * mov: do not try to read total disc/track number if data atom is too short.Carl Eugen Hoyos2012-06-26
| | | | | | | | | | | | Fixes bug 308. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | mov: add workaround for incorrect 0 time point.Michael Niedermayer2012-07-01
| | | | | | | | | | | | Fixes Ticket1471 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: log: Only include unistd.h if configure found it ape: create audio stream before reading tags. mov: make a length variable larger. image2: Add "start_number" private option to the demuxer image2: Add "start_number" private option to the muxer avconv: remove a forgotten debugging printf. avconv: use more descriptive names for hardcoded filters. avconv: remove redundant handling of async. doc/filters: fix typo. h264: use asm cabac reader under a generic condition Conflicts: ffmpeg.c libavformat/img2dec.c libavformat/img2enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-29 14:32:41 +0000