summaryrefslogtreecommitdiffstats
path: root/libavformat/mov.c
Commit message (Collapse)AuthorAgeFilesLines
* avformat/mov: fix regression in processing .aax filesVesselin Bontchev2015-08-021-3/+3
| | | | | | | | | Commit 0a551cbe introduced "activation_bytes" option, and not specifying this option (while calling ffmpeg / ffprobe) causes the program to quit early. Before this commit, ffprobe was capable of processing metadata in .aax files. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba'Michael Niedermayer2015-07-271-5/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '059a934806d61f7af9ab3fd9f74994b838ea5eba': lavc: Consistently prefix input buffer defines Conflicts: doc/examples/decoding_encoding.c libavcodec/4xm.c libavcodec/aac_adtstoasc_bsf.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.h libavcodec/asvenc.c libavcodec/avcodec.h libavcodec/avpacket.c libavcodec/dvdec.c libavcodec/ffv1enc.c libavcodec/g2meet.c libavcodec/gif.c libavcodec/h264.c libavcodec/h264_mp4toannexb_bsf.c libavcodec/huffyuvdec.c libavcodec/huffyuvenc.c libavcodec/jpeglsenc.c libavcodec/libxvid.c libavcodec/mdec.c libavcodec/motionpixels.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/noise_bsf.c libavcodec/nuv.c libavcodec/nvenc.c libavcodec/options.c libavcodec/parser.c libavcodec/pngenc.c libavcodec/proresenc_kostya.c libavcodec/qsvdec.c libavcodec/svq1enc.c libavcodec/tiffenc.c libavcodec/truemotion2.c libavcodec/utils.c libavcodec/utvideoenc.c libavcodec/vc1dec.c libavcodec/wmalosslessdec.c libavformat/adxdec.c libavformat/aiffdec.c libavformat/apc.c libavformat/apetag.c libavformat/avidec.c libavformat/bink.c libavformat/cafdec.c libavformat/flvdec.c libavformat/id3v2.c libavformat/isom.c libavformat/matroskadec.c libavformat/mov.c libavformat/mpc.c libavformat/mpc8.c libavformat/mpegts.c libavformat/mvi.c libavformat/mxfdec.c libavformat/mxg.c libavformat/nutdec.c libavformat/oggdec.c libavformat/oggparsecelt.c libavformat/oggparseflac.c libavformat/oggparseopus.c libavformat/oggparsespeex.c libavformat/omadec.c libavformat/rawdec.c libavformat/riffdec.c libavformat/rl2.c libavformat/rmdec.c libavformat/rtpdec_latm.c libavformat/rtpdec_mpeg4.c libavformat/rtpdec_qdm2.c libavformat/rtpdec_svq3.c libavformat/sierravmd.c libavformat/smacker.c libavformat/smush.c libavformat/spdifenc.c libavformat/takdec.c libavformat/tta.c libavformat/utils.c libavformat/vqf.c libavformat/westwood_vqa.c libavformat/xmv.c libavformat/xwma.c libavformat/yop.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * lavc: Consistently prefix input buffer definesVittorio Giovara2015-07-271-10/+10
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615'Michael Niedermayer2015-07-271-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615': lavc: AV-prefix all codec flags Conflicts: doc/examples/muxing.c ffmpeg.c ffmpeg_opt.c ffplay.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/ac3enc_float.c libavcodec/atrac1.c libavcodec/atrac3.c libavcodec/atrac3plusdec.c libavcodec/dcadec.c libavcodec/ffv1enc.c libavcodec/h264.c libavcodec/h264_loopfilter.c libavcodec/h264_mb.c libavcodec/imc.c libavcodec/libmp3lame.c libavcodec/libtheoraenc.c libavcodec/libtwolame.c libavcodec/libvpxenc.c libavcodec/libxavs.c libavcodec/libxvid.c libavcodec/mpeg12dec.c libavcodec/mpeg12enc.c libavcodec/mpegaudiodec_template.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_motion.c libavcodec/nellymoserdec.c libavcodec/nellymoserenc.c libavcodec/nvenc.c libavcodec/on2avc.c libavcodec/options_table.h libavcodec/opus_celt.c libavcodec/pngenc.c libavcodec/ra288.c libavcodec/ratecontrol.c libavcodec/twinvq.c libavcodec/vc1_block.c libavcodec/vc1_loopfilter.c libavcodec/vc1_mc.c libavcodec/vc1dec.c libavcodec/vorbisdec.c libavcodec/vp3.c libavcodec/wma.c libavcodec/wmaprodec.c libavcodec/x86/hpeldsp_init.c libavcodec/x86/me_cmp_init.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * Revert "mov: Double-check that alias path is not an absolute path"Vittorio Giovara2015-07-171-1/+1
| | | | | | | | | | | | | | This reverts commit 9286de045968ad456d4e752651eec22de5e89060. The change broke support for legit absolute file paths. Reported-by: Maksym Veremeyenko <verem@m1stereo.tv>.
* | Add support for Audible AAX (and AAX+) filesVesselin Bontchev2015-07-191-0/+128
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/mov: Implement a same origin policy for references instead of only ↵Michael Niedermayer2015-07-151-2/+42
| | | | | | | | | | | | | | | | allowing a subset of relative pathes in references Fixes Ticket4671 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/mov: Fix opening relative referencesMichael Niedermayer2015-07-151-2/+5
| | | | | | | | | | | | | | | | | | | | Possibly fixes Ticket4671 the removed check is wrong and insufficient Based on patch by Maksym Veremeyenko <verem@m1.tv> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/mov: Fix deallocation when MOVStreamContext failed to allocateMichael Niedermayer2015-07-141-0/+3
| | | | | | | | | | | | | | Fixes: 260813283176b57b3c9974fe284eebc3_signal_sigsegv_7ffff713351a_991_xtrem_e2_m64q15_a32sxx.3gp with memlimit of 262144 Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/mov: Use ff_configure_buffers_for_index()Michael Niedermayer2015-07-131-0/+1
| | | | | | | | | | | | | | Fixes Ticket2513 Fixes Ticket4432 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd80811c94e068085aab797f9ba35790529126f85'Michael Niedermayer2015-07-121-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd80811c94e068085aab797f9ba35790529126f85': riff: Use the correct logging context Conflicts: libavformat/asfdec_o.c libavformat/avidec.c libavformat/dxa.c libavformat/matroskadec.c libavformat/mov.c libavformat/riff.h libavformat/riffdec.c libavformat/wavdec.c libavformat/wtvdec.c libavformat/xwma.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * riff: Use the correct logging contextLuca Barbato2015-07-111-1/+1
| |
* | Merge commit 'a1e2caa93e4f8102666a21222f01b74838b6497f'Michael Niedermayer2015-07-011-2/+3
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'a1e2caa93e4f8102666a21222f01b74838b6497f': mov: Log format rather than fourcc in stsd in trace mode Conflicts: libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Log format rather than fourcc in stsd in trace modeVittorio Giovara2015-07-011-3/+3
| | | | | | | | This will fix remaining format warnings.
* | Merge commit '2eef75fd7e1ac96ab9ca63bb4523078c908bc9b1'Michael Niedermayer2015-07-011-1/+1
|\ \ | |/ | | | | | | | | | | * commit '2eef75fd7e1ac96ab9ca63bb4523078c908bc9b1': mov: Adjust variable types to fix format warnings Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Adjust variable types to fix format warningsVittorio Giovara2015-07-011-1/+1
| |
* | Merge commit '6ec688e1bc76dd93151cbca1c340162ae4b10d77'Michael Niedermayer2015-06-211-1/+9
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit '6ec688e1bc76dd93151cbca1c340162ae4b10d77': mp3: enable packed main_data decoding in MP4 Conflicts: libavcodec/mpegaudiodec_template.c Only the parts needed to support the available sample are merged the remaining error checks are left in place Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mp3: enable packed main_data decoding in MP4nu7742015-06-201-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 14496-3 suggests packing main_data of MP3 that is usually scattered into multiple frames due to bit reservoir. However, after packing main_data into a access unit, bitrate index in the MPEG audio frame header doesn't match with actual frame size. In order to accept this, this patch removes unnecessary frame size checking on mp3 decoder. Also, mov demuxer was changed to use MP3 parser only on special cases (QT MOV with specific sample description) to avoid re-packetizing. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '6308cd4868d2bd5fdf8bfa8dd10856c9a91874f5'Michael Niedermayer2015-06-081-1/+5
|\ \ | |/ | | | | | | | | | | * commit '6308cd4868d2bd5fdf8bfa8dd10856c9a91874f5': mov: Check memory allocation Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Check memory allocationVittorio Giovara2015-06-081-1/+5
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 1292518
* | avformat/mov: Retry same packet on IO failure to avoid loosing a packetMichael Niedermayer2015-06-031-2/+13
| | | | | | | | | | | | Based on patch by: Zhang Rui <bbcallen@gmail.com> Reviewed-by: Zhang Rui <bbcallen@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '5c720657c23afd798ae0db7c7362eb859a89ab3d'Michael Niedermayer2015-06-011-41/+75
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '5c720657c23afd798ae0db7c7362eb859a89ab3d': mov: always check avio_read return value Conflicts: libavformat/mov.c See: b71528d8967c1e10f499432fe26ff4713d1fd3b6 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: always check avio_read return valueAndreas Cadhalpun2015-05-311-22/+101
| | | | | | | | | | | | | | | | | | | | | | If avio_read fails, the buffer can contain uninitialized data. This fixes 'Conditional jump or move depends on uninitialised value(s)' valgrind warnings, and addresses a few memleaks. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * mov: reject zero bytes_per_frame with non-zero samples_per_frameAndreas Cadhalpun2015-05-311-0/+7
| | | | | | | | | | | | | | In this case the mov demuxer can return a large number of empty packets. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'a8a90906fb0ad0f8d3c68a97f182528ee3b5198c'Michael Niedermayer2015-06-011-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'a8a90906fb0ad0f8d3c68a97f182528ee3b5198c': mov: Correctly allocate ctts_data Conflicts: libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Correctly allocate ctts_dataLuca Barbato2015-05-311-1/+1
| | | | | | | | | | | | It can be reallocated. CC: libav-stable@libav.org
| * mov: Fix two memleaksAndreas Cadhalpun2015-05-311-1/+4
| | | | | | | | | | | | | | Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org> CC: libav-stable@libav.org
* | avformat/mov: Also export loci altitudeMichael Niedermayer2015-05-301-2/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: Append place name instead of overwriting for lociMichael Niedermayer2015-05-301-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mov: fix DTS calculation for samples with negative stts durationAndreas Cadhalpun2015-05-291-6/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A negative sample duration is invalid according to the spec, but there are samples that use it for the DTS calculation, e.g.: http://files.1f0.de/samples/mp4-negative-stts-problem.mp4 These currently get out of A/V sync. Also change the logging type to AV_LOG_WARNING, because decoding the sample can continue. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | avformat/mov: Avoid float usage in yuv_to_rgba()Michael Niedermayer2015-05-291-3/+3
| | | | | | | | | | | | This avoids the possibility for rounding/precision differences between platforms Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mov: reject zero bytes_per_frame with non-zero samples_per_frameAndreas Cadhalpun2015-05-261-0/+7
| | | | | | | | | | | | | | In this case the mov demuxer can return a large number of empty packets. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | avformat/mov: Mark avio context of decompressed atoms as seekableMichael Niedermayer2015-05-251-0/+1
| | | | | | | | | | | | Fixes Ticket4329 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mov: always check avio_read return valueAndreas Cadhalpun2015-05-241-12/+36
| | | | | | | | | | | | | | | | | | If avio_read fails, the buffer can contain uninitialized data. This fixes 'Conditional jump or move depends on uninitialised value(s)' valgrind warnings. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | mov: fix two memleaksAndreas Cadhalpun2015-05-241-1/+3
| | | | | | | | Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | avformat/mov: check result of avio_seekZhang Rui2015-05-211-1/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/mov: Tell users about the use_absolute_path option.Carl Eugen Hoyos2015-05-171-0/+5
| | | | | | | | Fixes ticket #4539.
* | avformat/mov: Fix parsing short lociMichael Niedermayer2015-05-161-1/+1
| | | | | | | | | | | | Fixes Ticket4557 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: Print reason of loci parsing failureMichael Niedermayer2015-05-161-3/+9
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: Use open_cb() if setMichael Niedermayer2015-05-111-3/+11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: Pass MovContext into mov_open_dref()Michael Niedermayer2015-05-111-7/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: Do not read ACLR into extradata for H.264Michael Niedermayer2015-04-301-0/+2
| | | | | | | | | | | | | | Fixes regression decoding AVCI Fixes Ticket4493 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov.c: Use %d to print an enum, not PRIu8Chris Watkins2015-04-211-1/+1
| | | | | | | | | | | | | | | | | | | | Using the PRIu8 format specifier to print an enum value causes a compiler warning, so use %d instead. Fixes ticket #4467. Signed-off-by: Chris Watkins <watk@chromium.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: remove per packet timestamp print trace, theres generic code ↵Michael Niedermayer2015-04-201-2/+1
| | | | | | | | | | | | doing this in utils.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '9286de045968ad456d4e752651eec22de5e89060'Michael Niedermayer2015-04-201-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '9286de045968ad456d4e752651eec22de5e89060': mov: Double-check that alias path is not an absolute path Conflicts: libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Double-check that alias path is not an absolute pathVittorio Giovara2015-04-191-1/+1
| | | | | | | | | | | | | | nlvl_to and nlvl_from can be set to 1 if both alias and target files are in the same directory, so actually check the first character of the string. We can do this because MacOS filepaths (alis type 2) are always converted to UNIX filepaths (alis type 18).
* | Merge commit '376589e5dd72aa2dd42500f456fca303fcdcad85'Michael Niedermayer2015-04-201-1/+3
|\ \ | |/ | | | | | | | | | | * commit '376589e5dd72aa2dd42500f456fca303fcdcad85': mov: Read alternate absolute path in dref alis Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Read alternate absolute path in dref alisVittorio Giovara2015-04-191-1/+3
| | | | | | | | | | | | | | Absolute paths can be stored in alis type 2 and 18 according to my research: the first is the canonical MacOS filepath, with path level separated by colons, and the volume name within the filepath, while the second should be the absolute filesystem path from the mount point.
* | Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'Michael Niedermayer2015-04-201-42/+43
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1a3eb042c704dea190c644def5b32c9cee8832b8': Replace av_dlog with normal av_log at trace level Conflicts: ffplay.c libavdevice/fbdev_dec.c libavfilter/avfilter.c libavfilter/internal.h libavfilter/setpts.c libavfilter/src_movie.c libavfilter/vf_crop.c libavfilter/vf_drawtext.c libavfilter/vf_fieldorder.c libavformat/assdec.c libavformat/avidec.c libavformat/flvdec.c libavformat/http.c libavformat/ipmovie.c libavformat/isom.c libavformat/mov.c libavformat/mpegenc.c libavformat/mpegts.c libavformat/mpegtsenc.c libavformat/mux.c libavformat/mxfdec.c libavformat/nsvdec.c libavformat/oggdec.c libavformat/r3d.c libavformat/rtspdec.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace av_dlog with normal av_log at trace levelVittorio Giovara2015-04-191-41/+42
| | | | | | | | This applies to every library where performance is not critical.
OpenPOWER on IntegriCloud