summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* avformat/avio: Document the end of list case in avio_read_dir()Michael Niedermayer2015-03-27
| | | | | | This was mentioned in a previous review Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf: add directory listing APILukasz Marek2015-03-27
| | | | | | | | API allows protocol implementations to provide API that allows to list directory content. API is similar to POSIX opendir/readdir/closedir. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/dv: fix used dimension variablesMichael Niedermayer2015-03-26
| | | | | | | Fixes null pointer dereference during seeking Fixes Ticket4395 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/rmdec: fix support for 0 sized mdprMichael Niedermayer2015-03-26
| | | | | | Fixes Ticket4393 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avisynth: drop support of AviSynth 2.5Stephen Hutchinson2015-03-25
| | | | | | | If the user attempts to use AviSynth 2.5, an error message will now tell them they need to upgrade. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/utils: Terminate SPS in avci100_1080i_extradata to avoid warnings ↵Michael Niedermayer2015-03-24
| | | | | | | during parsing Fixes: AVCI100_Test.mxf Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/mov: check color parameter type explicitly.Jochen Strunk2015-03-24
| | | | | | | | | | | Fixes ticket #4387. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Note, Vittorio Giovara had submitted a very similar fix to me privately a few hours before this, iam applying Jochens because it comes with a commit message too and i had not yet applied Vittorios, but For sake of credit, Vittorio independently solved this first
* Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2015-03-24
|\ | | | | | | | | | | | | * cehoyos/master: lavf/matroskaenc: List subtitle codecs with fake codec_tags to allow remuxing. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf/matroskaenc: List subtitle codecs with fake codec_tags to allow remuxing.Carl Eugen Hoyos2015-03-24
| | | | | | | | Fixes remuxing of DVBSUB to mkv.
* | Merge commit 'a8c99205ca8703bd849efae13fcf844315c7147d'Michael Niedermayer2015-03-24
|\ \ | |/ |/| | | | | | | | | * commit 'a8c99205ca8703bd849efae13fcf844315c7147d': avisynth: Fix compilation against current 2.6 header(s). Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avisynth: Fix compilation against current 2.6 header(s).Stephen Hutchinson2015-03-24
| | | | | | | | | | | | | | | | | | AviSynth 2.6 (and by extension, AviSynth+) moves these functions into AVSC_API. This requires both adjusting their normal use, and for AvxSynth, adjusting the position/use of the USING_AVISYNTH ifdefs. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'e4fe535d12f4f30df2dd672e30304af112a5a827'Michael Niedermayer2015-03-24
|\| | | | | | | | | | | | | | | | | | | | | * commit 'e4fe535d12f4f30df2dd672e30304af112a5a827': mov: Write the display matrix in order Conflicts: libavformat/mov.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Write the display matrix in orderVittorio Giovara2015-03-23
| | | | | | | | | | | | | | | | | | | | This will allow to copy the matrix as is and it is just cleaner to keep the matrix in the same order specified by the mov standard (which is also explicitly described in the documentation). In order to preserve compatibility, flip the angle sign in the display API av_display_rotation_set() and av_display_rotation_get(), and improve the documentation mentioning the rotation direction.
* | libavformat/mxfenc: add container duration and package name to primer packMark Reid2015-03-23
| | | | | | | | | | Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'e0046bc9c96150fa06146ace9093f06857dd7b23'Michael Niedermayer2015-03-23
|\| | | | | | | | | | | | | | | | | | | * commit 'e0046bc9c96150fa06146ace9093f06857dd7b23': movenc: Write the make and model metadata keys for mov style files Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Write the make and model metadata keys for mov style filesMartin Storsjö2015-03-23
| | | | | | | | | | | | | | These are essential allowing QuickTime to keep detecting content as slow-motion - this allows preserving them on stream copy. Signed-off-by: Martin Storsjö <martin@martin.st>
| * oggdec: Check memory allocationFederico Tomassetti2015-03-21
| | | | | | | | | | | | Bug-Id: CID 1257798 / CID 1257805 Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Revert "avformat/flvenc: Allow muxing video codecs which are not explicitly ↵Michael Niedermayer2015-03-22
| | | | | | | | | | | | | | | | | | | | supported by the muxer" This commit has no known use case ATM as there are no unsupported video codecs in flv and could theoretically be use to generate broken files allthough that would be not entirely easy as tags/codecs still get sanity checked This reverts commit 76f4b117807c30a528539fc5c7a7e35cb288cfcf.
* | avformat/flvenc: Allow muxing video codecs which are not explicitly ↵Michael Niedermayer2015-03-22
| | | | | | | | | | | | | | | | | | | | | | | | supported by the muxer This allows stream copying video codecs before they are explicitly supported. The same feature was in the past useful for audio codecs in flv This partly reverts the changes from 735ab7c5e04e2316afbd56643c13de17a7ac89cd Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '93c1b04abfc0dd31211a18bf2c0041d69cd16919'Michael Niedermayer2015-03-22
|\| | | | | | | | | | | | | * commit '93c1b04abfc0dd31211a18bf2c0041d69cd16919': mms: Check memory allocation Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mms: Check memory allocationFederico Tomassetti2015-03-21
| | | | | | | | | | | | Bug-Id: CID 1258462 Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * rmenc: Check memory allocationFederico Tomassetti2015-03-21
| | | | | | | | | | | | Bug-Id: CID 1257832 Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avformat/movenc: avoid using uninitialized display_matrix_sizeMichael Niedermayer2015-03-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '342fc46c69199b076b7c210f42208ce39a2bde1c'Michael Niedermayer2015-03-20
|\| | | | | | | | | | | | | | | | | | | * commit '342fc46c69199b076b7c210f42208ce39a2bde1c': cmdutils: Add a stream specifier to map usable streams Conflicts: cmdutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'cf18e777aed9f73011c7ab7cbab8003189d4b9d8'Michael Niedermayer2015-03-20
|\| | | | | | | | | | | | | | | | | | | * commit 'cf18e777aed9f73011c7ab7cbab8003189d4b9d8': movenc: write the display transform matrix Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: write the display transform matrixAnton Khirnov2015-03-19
| |
* | avformat/avienc: Expand master ODML index when its end is reachedMichael Niedermayer2015-03-19
| | | | | | | | | | | | | | Fixes 256Gb limit Fixes Ticket4225 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avienc: Fix wrongly placed commentMichael Niedermayer2015-03-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avidec: also print frame_num in debug outputMichael Niedermayer2015-03-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avienc: factor out update_odml_entry()Michael Niedermayer2015-03-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avienc: factor write_odml_master() outMichael Niedermayer2015-03-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '67a2912307c3c08f2725ccae162cfe3426b80184'Michael Niedermayer2015-03-19
|\| | | | | | | | | | | | | * commit '67a2912307c3c08f2725ccae162cfe3426b80184': movenc: Don't assume that fragment durations in pts is equal to duration in dts Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Don't assume that fragment durations in pts is equal to duration in dtsMartin Storsjö2015-03-19
| | | | | | | | | | | | | | | | | | | | | | | | | | For strict CFR, they should be pretty much equal, but if the stream is VFR, there can be a sometimes significant difference. Calculate the pts duration separately, used in sidx atoms and for tfrf/tfxd boxes in smooth streaming ismv files. Also make sure to reduce the duration of sidx entries according to edit lists. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '5c337353a2546416631a87de4881850d99141c39'Michael Niedermayer2015-03-19
|\| | | | | | | | | | | | | * commit '5c337353a2546416631a87de4881850d99141c39': movenc: Move sidx edit list timestamp adjustment into a block Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Move sidx edit list timestamp adjustment into a blockMartin Storsjö2015-03-19
| | | | | | | | | | | | | | When reading these values from track->frag_info, the same adjustment has already been done. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'eee13d653953083553cceadbbedf6222ef78a006'Michael Niedermayer2015-03-19
|\| | | | | | | | | | | | | * commit 'eee13d653953083553cceadbbedf6222ef78a006': movenc: Only adjust the cts offset at the start of fragments if necessary Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Only adjust the cts offset at the start of fragments if necessaryMartin Storsjö2015-03-19
| | | | | | | | | | | | | | | | | | Adjusting it is only necessary when a sidx/tfrf/tfxd atom already has been written for the previous fragment (since the sidx/tfrf/tfxd atoms include the duration between the first pts of the previous fragment, to the first pts of the new fragment). Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '5cf892d6946b19a87bcd00d6b76ce81f45960fdb'Michael Niedermayer2015-03-19
|\| | | | | | | | | | | | | * commit '5cf892d6946b19a87bcd00d6b76ce81f45960fdb': movenc: Write pts timestamps in tfxd, instead of dts timestamps Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Write pts timestamps in tfxd, instead of dts timestampsMartin Storsjö2015-03-19
| | | | | | | | | | | | This matches what we write in tfra and tfrf since 9cbf70fa0e. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'b81b0cc22b22413760423e239ea644c9afdbfa2d'Michael Niedermayer2015-03-19
|\| | | | | | | | | | | | | * commit 'b81b0cc22b22413760423e239ea644c9afdbfa2d': movenc: Set the last packet duration based on the next packet when autoflushing Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Set the last packet duration based on the next packet when autoflushingMartin Storsjö2015-03-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When automatically flushing fragments based on set conditions (fragmentation on keyframes, after some interval or byte size), we already have the next packet for one stream - use this for setting the duration of the last packet in the flushed fragment correctly. This avoids having to adjust the timestamp of the first packet in the new fragment since the last duration was unknown. Unfortunately, this only works for automatic flushing (not for caller-triggered flushing, like in the dash muxer), and only for the one single track that triggered the flushing. The duration of the last sample in all other tracks still is dependent on AVPacket duration (or heuristics). Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '3041183677bda0a431b36e96a2c76617abaa8183'Michael Niedermayer2015-03-19
|\| | | | | | | | | | | | | * commit '3041183677bda0a431b36e96a2c76617abaa8183': dashenc: Heuristically fill in the duration of packets that need it Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dashenc: Heuristically fill in the duration of packets that need itMartin Storsjö2015-03-19
| | | | | | | | | | | | | | | | | | | | | | This avoids that the mp4 muxer does a similar heuristic, adjusting the timestamps in a way that the dash muxer doesn't know the actual timestamps written to the file in the end. By making sure that the mp4 muxer internal heuristic isn't applied, we know the exact timestamps written to file, so that the timestamps in manifest match the files. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '2889c5e16711770437f380f1bead5f72c6a0b17a'Michael Niedermayer2015-03-19
|\| | | | | | | | | | | | | * commit '2889c5e16711770437f380f1bead5f72c6a0b17a': movenc: Heuristically set the duration of the last sample in a fragment if not set Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Heuristically set the duration of the last sample in a fragment if ↵Martin Storsjö2015-03-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not set Even if this is a guess, it is way better than writing a zero duration of the last sample in a fragment (because if the duration is zero, the first sample of the next fragment will have the same timestamp as the last sample in the previous one). Since we normally don't require libavformat muxer users to set the duration field in AVPacket, we probably can't strictly require it here either, so don't log this as a strict warning, only as info. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '8dc72eeaf647736c287b59a3856a11904bedd58b'Michael Niedermayer2015-03-19
|\| | | | | | | | | | | | | | | * commit '8dc72eeaf647736c287b59a3856a11904bedd58b': udp: Fix crashes after adding AVOptions See: aefed6ca87971a9d277157c92fef4cdd42c5c1e2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * udp: Fix crashes after adding AVOptionsMartin Storsjö2015-03-19
| | | | | | | | | | | | | | | | | | | | | | Add a missing AVClass member, check whether localaddr is null. (Previously, localaddr was always a local stack buffer, while it now also can be an avoption string which can be null.) This fixes crashes when not passing any localaddr parameter, since 66028b7ba. Signed-off-by: Martin Storsjö <martin@martin.st>
* | mxfenc: don't try to write footer without headerAndreas Cadhalpun2015-03-19
| | | | | | | | | | | | | | | | This fixes a crash, when trying to mux h264 into mxf_opatom. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Previous version reviewed-by: tomas.hardin@codemill.se Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/aiffdec: do not fail if header parser hits EOFMichael Niedermayer2015-03-19
| | | | | | | | | | Based on patch by Martin Vignali <martin.vignali@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/aiffdec: Stop header parsing once a non header packet is reachedMichael Niedermayer2015-03-19
| | | | | | | | | | | | | | Fix Ticket3530 Based-on debuging work by Martin Vignali <martin.vignali@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>