summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* avformat/nutenc: store the actual r_frame_rate in the corresponding field if ↵Michael Niedermayer2014-12-14
| | | | | | | | available Fixes Ticket 3629 part3 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/utils: use r_frame_rate only in the demuxer for ↵Michael Niedermayer2014-12-14
| | | | | | | | | | | ff_compute_frame_duration() This is primarly to maintain current behavior when r_frame_rate is set for muxers and could be reverted if it has some advantage Fixes Ticket3629 part1 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* fix "than" typoMichael Niedermayer2014-12-13
| | | | | Found-by reimar Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/utils: Do not estimate the container bitrate from the streams if ↵Michael Niedermayer2014-12-13
| | | | | | one video stream lacks the bitrate Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/mov: Simplify code by using OFFSET() and FLAGS macrosMichael Niedermayer2014-12-13
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/utils: check for malloc failurewm42014-12-12
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/mov: Disable XMP metadata by defaultMichael Niedermayer2014-12-11
| | | | | | | | | This was suggested by cbsrobot, ubitux and koda There are files with huge amounts of XMP data, which would otherwise be displayed in the terminal output of FFmpeg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/avidec: Do not fail for crazy start timesGabor Nagy2014-12-11
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'e737a4aaafcb1d761b7f96043c2f83ce742c64ae'Michael Niedermayer2014-12-11
|\ | | | | | | | | | | | | | | | | | | | | * commit 'e737a4aaafcb1d761b7f96043c2f83ce742c64ae': dashenc: Change the duration fields to 64 bit Conflicts: libavformat/dashenc.c See: e65849a70bfb401306038d41ebd8b5750deb3cfd Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dashenc: Change the duration fields to 64 bitMartin Storsjö2014-12-10
| | | | | | | | | | | | | | | | For the last_duration field, it's mostly theoretical, but the total_duration field more probably may need to actually be 64 bit. Bug-Id: CID 1254944 Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/hlsenc: added segment file deletionChristian Suloway2014-12-10
| | | | | | | | | | | | | | | | | | This option flag deletes segment files removed from the playlist after a period of time equal to the duration of the segment plus the duration of the playlist. Signed-off-by: Christian Suloway <csuloway@globaleagleent.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/yuv4mpegdec: fix "warning: field_order may be used uninitialized in ↵Michael Niedermayer2014-12-10
| | | | | | | | | | | | this function" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/flvdec: fix potential use of uninitialized variablesMichael Niedermayer2014-12-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avidec: Increase dshow_block_align use threshold by 1Gabor Nagy2014-12-10
| | | | | | | | | | | | Fixes 00.avi Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'fa8934d6d6a0bb290010bdf16265c40b331d56fb'Michael Niedermayer2014-12-10
|\| | | | | | | | | | | | | * commit 'fa8934d6d6a0bb290010bdf16265c40b331d56fb': dashenc: log file output progress in verbose mode Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dashenc: log file output progress in verbose modeBryan Huh2014-12-10
| | | | | | | | | | | | | | As the manifest/segments are flushed to disk, log to stderr the progress, when in verbose logging mode Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '95d880fa6436f3b557a9c060428a04b9e4d552df'Michael Niedermayer2014-12-10
|\| | | | | | | | | | | | | * commit '95d880fa6436f3b557a9c060428a04b9e4d552df': rtpproto: Fix the input RTP data format check Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpproto: Fix the input RTP data format checkMartin Storsjö2014-12-09
| | | | | | | | | | | | | | | | | | | | | | | | | | Only the upper 2 bits of the first byte are known to be a fixed value. The lower bits in the first byte of a RTP packet could be set if the input is from another RTP packetizers than libavformat's, but for RTCP packets, they would also be set when sending RTCP RR packets, triggering false warnings about incorrect input format to the protocol. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Allow mov musing if the ac3 parser was disabled.Carl Eugen Hoyos2014-12-09
| | | | | | | | | | This reverts 8091fe30. Reported and tested by Takashi, ffmpeg-list dubistmeinheld de
* | Merge commit 'fccfc22d1f304aef42a0b960e4c1d55ce67107f5'Michael Niedermayer2014-12-09
|\| | | | | | | | | | | | | * commit 'fccfc22d1f304aef42a0b960e4c1d55ce67107f5': libavformat: Build hevc.o when building the RTP muxer Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavformat: Build hevc.o when building the RTP muxerMartin Storsjö2014-12-09
| | | | | | | | | | | | | | | | | | The RTP muxer enables the actual codepaths within sdp.c, which depend on hevc.o since e5cfc8fd. This fixes builds with --disable-everything --enable-muxer=rtp. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/crypto: fix key vs iv typoMichael Niedermayer2014-12-09
| | | | | | | | | | | | Fixes Ticket 4167 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: change assert to av_assert0()Michael Niedermayer2014-12-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: replace impossible condition by av_assert0() in ff_gen_search()Michael Niedermayer2014-12-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/wavenc: check return value of strftime()Michael Niedermayer2014-12-09
| | | | | | | | | | | | Fixes CID1257006 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '3c01039e0bc7d269900e15551f8171c4328a0223'Michael Niedermayer2014-12-09
|\| | | | | | | | | | | | | * commit '3c01039e0bc7d269900e15551f8171c4328a0223': mov: further expand the list of parsed metadata tags Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: further expand the list of parsed metadata tagsDave Rice2014-12-08
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avformat/utils: fix calculating the absolute difference of timestampsMichael Niedermayer2014-12-09
| | | | | | | | | | | | we dont use FFABS(a-b) as that could result in undefined behavior if it overflows Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: Compute the current pts of mpeg1/2 I/P frames from the next ↵Michael Niedermayer2014-12-09
| | | | | | | | | | | | frame when available Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: Pass the next pts/dts to compute_pkt_fields() when availableMichael Niedermayer2014-12-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'e2e07dbaab1f17e995842b7eacec4665d44c3d14'Michael Niedermayer2014-12-08
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'e2e07dbaab1f17e995842b7eacec4665d44c3d14': mov: expand the list of parsed metadata tags Conflicts: libavformat/mov.c See: 543f3db9784348499a1ac1088373e2fb9100d4c0 See: dadf668df20e041b330fa4d3c5feb32a3f495d32 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: expand the list of parsed metadata tagsVittorio Giovara2014-12-08
| | | | | | | | Based on L-Smash code by Yusuke Nakamura <muken.the.vfrmaniac@gmail.com>.
* | Merge commit 'b704b648f9ecb830874627db958a37e004107d1b'Michael Niedermayer2014-12-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b704b648f9ecb830874627db958a37e004107d1b': mov: parse XMP metadata on demand Conflicts: libavformat/isom.h libavformat/version.h See: 054c506e3da35471ea92dbedcaaf720d0754f04e The default is left unchanged at enabled We can change the default if people prefer but i do not want to do that in a merge. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: parse XMP metadata on demandVittorio Giovara2014-12-08
| | | | | | | | | | | | | | | | | | The Extensible Metadata Platform tag can contain various kind of data which are not strictly related to the video file, such as history of edits and saves from the project file. So display XMP metadata only when the user explicitly requires it. Based on a patch by Marek Fort <marek.fort@chyronhego.com>.
* | Merge commit '174c5fde90060faab67796a5eaef742630f1db6e'Michael Niedermayer2014-12-08
|\| | | | | | | | | | | | | | | | | | | | | * commit '174c5fde90060faab67796a5eaef742630f1db6e': mov: parse @PRM and @PRQ metadata tags Conflicts: libavformat/mov.c See: f540851ce320bc69621ea70b89857c54129c82c2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: parse @PRM and @PRQ metadata tagsVittorio Giovara2014-12-08
| | | | | | | | | | | | | | | | | | These tags describe the product and quicktime library version respectively. They originate from Adobe Premiere, but also some other programs use them. Contrary to other tags, they contain 'raw' data which is not to be interpreted as iso639 or mac strings. Based on a patch by Peter Ross <pross@xvid.org>.
* | Merge commit '35384934d6e27e0334060a23a0c83a3cb5cef198'Michael Niedermayer2014-12-08
|\| | | | | | | | | | | | | | | | | | | * commit '35384934d6e27e0334060a23a0c83a3cb5cef198': mov: cosmetics: reorder the list of tags Conflicts: libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: cosmetics: reorder the list of tagsVittorio Giovara2014-12-08
| | | | | | | | | | Alphabetically order the list by the tag to facilitate the insertion of new ones.
| * Allow reading of growing avi files (currently being written)Joakim Plate2014-12-08
| | | | | | | | | | | | | | | | | | | | | | | | | | This uses the RIFF header stored size to figure out the expected AVI file size, instead of the actual file. To work fully it requires handling failed avio_seek() instead of assuming they always succeed. Some fate file has been cut off and contains half a frame at the end which previously was not output during demuxing. This frame is now output to encoder, thus the fate diff update. Bug-Id: 261 Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
| * riff: Support decoding png in avi (ImageJ)Carl Eugen Hoyos2014-12-08
| |
* | Merge commit '29bc7bfba288ff8572ed967a8752a1dbde7b724b'Michael Niedermayer2014-12-08
|\| | | | | | | | | | | | | * commit '29bc7bfba288ff8572ed967a8752a1dbde7b724b': rtpproto: Write a warning if the input data written isn't RTP packetized Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpproto: Write a warning if the input data written isn't RTP packetizedMartin Storsjö2014-12-08
| | | | | | | | | | | | | | Tell the user that the RTP muxer needs to be used to packetize the data - using the RTP protocol on its own isn't enough. Signed-off-by: Martin Storsjö <martin@martin.st>
| * mp3: Tweak the probe scoresLuca Barbato2014-12-07
| | | | | | | | | | | | | | | | Having more than 10 consecutive frames decoded as mp3 should be considered a clear signal that the sample is mp3 and not mpegps. Reported-By: Florian Iragne <florian@iragne.fr> CC: libav-stable@libav.org
| * latm: Do not give a score for a single instanceLuca Barbato2014-12-07
| | | | | | | | | | Bug-Id: 773 CC: libav-stable@libav.org
| * mov: skip version and flags attributes in mov_read_chan()Matthieu Bouron2014-12-05
| | | | | | | | | | | | | | | | | | Fixes decting channel layout for files with uncommon audio, such as FL and FR in two separate streams. Introduced in 3bab7cd. CC: libav-devel@libav.org Sample-Id: ticket1474.mov Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avformat/movenc: Add 2048x1080 to the aivx caseRens Dijkshoorn2014-12-08
| | | | | | | | | | | | This improves compatibility of such files with apple tools Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroskadec: request a sample with recursive seek headsMichael Niedermayer2014-12-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroskadec: fix handling of recursive SeekHead elementswm42014-12-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When matroska_execute_seekhead() is called, it goes through the list of seekhead entries and attempts to read elements not read yet. When doing this, the parser can find further SeekHead elements, and will extend the matroska->seekhead list. This can lead to a (practically) infinite loop with certain broken files. (Maybe it can happen even with valid files. The demuxer doesn't seem to check correctly whether an element has already been read.) Fix this by ignoring elements that were added to the seekhead field during executing seekhead entries. This does not fix the possible situation when multiple SeekHead elements after the file header (i.e. occur after the "before_pos" file position) point to the same elements. These elements will probably be parsed multiple times, likely leading to bugs. Fixes ticket #4162. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/dashenc: make durations 64bitMichael Niedermayer2014-12-07
| | | | | | | | | | | | | | Fix potential integer overflow Fix CID1254944 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpeg: add commented out av_log() to probeMichael Niedermayer2014-12-06
| | | | | | | | | | | | This is commonly needed for debugging mis-detections Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-10 14:48:39 +0000