summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* avformat/rtmpproto: change rtmp_open from url_open to url_open2Steven Liu2017-03-22
| | | | | | | use the option set by user Reported-by: Lancelot Lai <laihy23@gmail.com> Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* avformat/apng: set max_fps to no limit by defaultJames Almer2017-03-21
| | | | | | | Should fix ticket #6252 Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
* avformat/apng: fix setting frame delay when max_fps is set to no limitJames Almer2017-03-21
| | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
* Merge commit '8ea35af7620e4f73f9e8c072e1c0fac9a04ec161'James Almer2017-03-21
|\ | | | | | | | | | | | | * commit '8ea35af7620e4f73f9e8c072e1c0fac9a04ec161': avio: add a new flag for marking streams seekable by timestamp Merged-by: James Almer <jamrial@gmail.com>
| * avio: add a new flag for marking streams seekable by timestampAnton Khirnov2016-09-30
| |
* | Merge commit '75c1db6152c7c90c7ce28c9adb945028e5512c4f'James Almer2017-03-21
|\| | | | | | | | | | | | | * commit '75c1db6152c7c90c7ce28c9adb945028e5512c4f': avio: cosmetics, prettify AVIO_SEEKABLE_NORMAL Merged-by: James Almer <jamrial@gmail.com>
| * avio: cosmetics, prettify AVIO_SEEKABLE_NORMALAnton Khirnov2016-09-30
| | | | | | | | | | Move the doxy above the definition, change the value itself to the (1 << n) pattern, which is more readable for flags.
* | Merge commit '83548fe894cdb455cc127f754d09905b6d23c173'James Almer2017-03-21
|\| | | | | | | | | | | | | * commit '83548fe894cdb455cc127f754d09905b6d23c173': lavf: fix usage of AVIOContext.seekable Merged-by: James Almer <jamrial@gmail.com>
| * lavf: fix usage of AVIOContext.seekableAnton Khirnov2016-09-30
| | | | | | | | | | | | | | | | It is supposed to be a flag. The only currently defined value is AVIO_SEEKABLE_NORMAL, but other ones may be added in the future. However all the current lavf code treats this field as a bool (mainly for historical reasons). Change all those cases to properly check for AVIO_SEEKABLE_NORMAL.
| * rtsp: Fix a crash with the RTSP muxerMartin Storsjö2016-09-15
| | | | | | | | | | | | | | | | | | | | | | | | | | This was introduced in bc2a32969e. The whole block that the statement was added to is only relevant when used as a demuxer, but the other statements there have had other if statements guarding them. Make sure to only run this whole block if being used as a demuxer. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
| * mov: Remove old b-frame/video delay heuristicDerek Buitenhuis2016-08-29
| | | | | | | | | | | | | | | | This was added before edts support existed, and is no longer valid. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * mov: Remove ancient heuristic hackDerek Buitenhuis2016-08-29
| | | | | | | | | | | | | | | | | | This breaks files with legitimate single-entry edit lists, and the hack, introduced in f03a081df09f9c4798a17d7e24446ed47924b11b, has no link to any known sample in its commit message. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avcodec, avformat: deprecate anything related to side data mergingwm42017-03-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch deprecates anything that has to do with merging/splitting side data. Automatic side data merging (and splitting), as well as all API symbols involved in it, are removed completely. Two FF_API_ defines are dedicated to deprecating API symbols related to this: FF_API_MERGE_SD_API removes av_packet_split/merge_side_data in libavcodec, and FF_API_LAVF_KEEPSIDE_FLAG deprecates AVFMT_FLAG_KEEP_SIDE_DATA in libavformat. Since it was claimed that changing the default from merging side data to not doing it is an ABI change, there are two additional FF_API_ defines, which stop using the side data merging/splitting by default (and remove any code in avformat/avcodec doing this): FF_API_MERGE_SD in libavcodec, and FF_API_LAVF_MERGE_SD in libavformat. It is very much intended that FF_API_MERGE_SD and FF_API_LAVF_MERGE_SD are quickly defined to 0 in the next ABI bump, while the API symbols are retained for a longer time for the sake of compatibility. AVFMT_FLAG_KEEP_SIDE_DATA will (very much intentionally) do nothing for most of the time it will still be defined. Keep in mind that no code exists that actually tries to unset this flag for any reason, nor does such code need to exist. Code setting this flag explicitly will work as before. Thus it's ok for AVFMT_FLAG_KEEP_SIDE_DATA to do nothing once side data merging has been removed from libavformat. In order to avoid that anyone in the future does this incorrectly, here is a small guide how to update the internal code on bumps: - next ABI bump (probably soon): - define FF_API_LAVF_MERGE_SD to 0, and remove all code covered by it - define FF_API_MERGE_SD to 0, and remove all code covered by it - next API bump (typically two years in the future or so): - define FF_API_LAVF_KEEPSIDE_FLAG to 0, and remove all code covered by it - define FF_API_MERGE_SD_API to 0, and remove all code covered by it This forces anyone who actually wants packet side data to temporarily use deprecated API to get it all. If you ask me, this is batshit fucked up crazy, but it's how we roll. Making AVFMT_FLAG_KEEP_SIDE_DATA to be set by default was rejected as an ABI change, so I'm going all the way to get rid of this once and for all. Reviewed-by: James Almer <jamrial@gmail.com> Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com> Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit 'd42809f9835a4e9e5c7c63210abb09ad0ef19cfb'Clément Bœsch2017-03-19
|\| | | | | | | | | | | | | * commit 'd42809f9835a4e9e5c7c63210abb09ad0ef19cfb': av1: Add codec_id and basic demuxing support Merged-by: Clément Bœsch <u@pkh.me>
| * av1: Add codec_id and basic demuxing supportLuca Barbato2016-08-24
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '24130234cd9dd733116d17b724ea4c8e12ce097a'Clément Bœsch2017-03-19
|\| | | | | | | | | | | | | | | | | * commit '24130234cd9dd733116d17b724ea4c8e12ce097a': rtpdec_mpeg4: validate fmtp fields Merged with fixed log message. Merged-by: Clément Bœsch <u@pkh.me>
| * rtpdec_mpeg4: validate fmtp fieldsLuca Barbato2016-08-23
| |
* | Merge commit 'be3363f664d7314d55b42860bd4077154752d769'Clément Bœsch2017-03-19
|\| | | | | | | | | | | | | * commit 'be3363f664d7314d55b42860bd4077154752d769': nsv: Drop disabled cruft Merged-by: Clément Bœsch <u@pkh.me>
| * nsv: Drop disabled cruftDiego Biurrun2016-08-17
| |
* | Merge commit 'a4b1b5aa281cacde8351d9947b54ccf82ff10cd0'Clément Bœsch2017-03-19
|\| | | | | | | | | | | | | * commit 'a4b1b5aa281cacde8351d9947b54ccf82ff10cd0': wc3movie: Drop unused cruft Merged-by: Clément Bœsch <u@pkh.me>
| * wc3movie: Drop unused cruftDiego Biurrun2016-08-17
| |
* | Merge commit 'd9442d13033a24b14ebae149dcdb42709430e2d9'Clément Bœsch2017-03-19
|\| | | | | | | | | | | | | * commit 'd9442d13033a24b14ebae149dcdb42709430e2d9': rm: Drop broken disabled cruft Merged-by: Clément Bœsch <u@pkh.me>
| * rm: Drop broken disabled cruftDiego Biurrun2016-08-17
| |
* | mov: Drop extra format specifier in error messageVittorio Giovara2017-03-17
| |
* | spherical: Change types of bounding and pad to uint32_tVittorio Giovara2017-03-17
| | | | | | | | | | | | | | | | | | These values are defined to be 32bit in the specification, so it makes more sense to store them as fixed width. Based on a patch by Micahel Niedermayer <michael@niedermayer.cc>. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '0638b99cdba52554691fc668d9e477bc184c7a33'Matthieu Bouron2017-03-17
|\| | | | | | | | | | | | | | | | | | | * commit '0638b99cdba52554691fc668d9e477bc184c7a33': aiff: Skip padding byte for odd-sized chunks Also removes to odd-size checks from get_aiff_header and get_meta to use the generic path introduced by the original commit. Merged-by: Matthieu Bouron <matthieu.bouron@gmail.com>
| * aiff: Skip padding byte for odd-sized chunksDiego Biurrun2016-08-10
| | | | | | | | Bug-Id: 660
| * m4vdec: Check for non-startcode 00 00 00 sequences in probeMichael Niedermayer2016-08-03
| | | | | | | | | | | | | | This makes the m4v detection less trigger-happy. Bug-Id: 949 Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * Revert "Don't use expressions with side effects in macro parameters"Martin Storsjö2016-08-02
| | | | | | | | | | | | | | | | | | This reverts commit 25bacd0a0c32ae682e6f411b1ac9020aeaabca72. Since 230b1c070, the bytewise AV_W*() macros only expand their argument once, so revert to the more readable version of these. Signed-off-by: Martin Storsjö <martin@martin.st>
| * Don't use expressions with side effects in macro parametersMartin Storsjö2016-07-31
| | | | | | | | | | | | | | | | | | AV_WB32 can be implemented as a macro that expands its parameters multiple times (in case AV_HAVE_FAST_UNALIGNED isn't set and the compiler doesn't support GCC attributes); make sure not to read multiple times from the source in this case. Signed-off-by: Martin Storsjö <martin@martin.st>
* | lavf/mpegtsenc: clarify pcr_period unit of measurementLou Logan2017-03-16
| | | | | | | | | | | | pcr_period is in milliseconds. Signed-off-by: Lou Logan <lou@lrcd.com>
* | Merge commit 'ed1cd81076434b76f37576d4d806973476a8e96c'Clément Bœsch2017-03-15
|\| | | | | | | | | | | | | | | | | | | | | * commit 'ed1cd81076434b76f37576d4d806973476a8e96c': flac demuxer: improve probing Suggested commit very closely matches our code, except with regards to AVPROBE_SCORE_EXTENSION. The code layout is mostly merged but preserves our behaviour. Merged-by: Clément Bœsch <u@pkh.me>
| * flac demuxer: improve probingAnton Khirnov2016-07-31
| | | | | | | | | | Extend the probe function to validate the STREAMINFO block that must follow the fLaC ID tag.
| * Fix instances of broken indentation found by gcc 6Anton Khirnov2016-07-31
| |
| * mov: Validate the ID numberLuca Barbato2016-07-29
| | | | | | | | | | | | IDs in MOV start from 1. Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | avformat/hlsenc: fix duration wrong when no pkt durationSteven Liu2017-03-15
| | | | | | | | | | | | | | when cannot get pkt duration, hlsenc segments duration will be set to 0, this patch can fix it. Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* | ffmpeg, ffprobe: don't "merge" side data into packet data by defaultwm42017-03-14
| | | | | | | | | | | | | | | | Preparation for potentially disabling merged side data by default in the libs. Do this in particular because it affects fate tests. The changed tests either reflect added packet side data, or the changed packet size due to merged side data removal reducing the packet size.
* | lavf/avio: Be more explicit in logging white/black list matchesAlexander Strasser2017-03-14
| | | | | | | | | | | | | | | | | | The current form of the messages indicating matches in the white or black lists seems to be a bit too much relying on context. Make the messages more explicit. Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
* | lavf/avio: Remove unnecessary escaping of ' in string literalsAlexander Strasser2017-03-14
| | | | | | | | Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
* | avformat/flvenc: flx flvflags no_metadata bugSteven Liu2017-03-14
| | | | | | | | | | | | | | When use flvflags no_metadata , the FLV header will be cover by write tailer This commit fix the bug Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* | avformat/hlsenc: fix ticket 6231Steven Liu2017-03-14
| | | | | | | | | | | | check if the hls_flags is byterange_mode and check if should close fd Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* | avformat/hlsenc: second_levels flags process function extractSteven Liu2017-03-13
| | | | | | | | | | | | | | the SECOND_LEVEL* flags process and name is too long extract all of them output to funtions, make code clear Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* | avcodec: add XPM decoder and demuxerParas Chadha2017-03-12
| | | | | | | | Signed-off-by: Paras Chadha <paraschadha18@gmail.com>
* | lavf/dashenc: update bitrates on dash_write_trailerPrzemysław Sobala2017-03-11
| | | | | | | | | | | | | | Provides a way to change bandwidth parameter inside DASH manifest after a non-CBR H.264 encoding. Caller now is able to compute the bitrate by itself, after all packets have been written, and then set that value in AVFormatContext->streams->codecpar->bit_rate before calling av_write_trailer. As a result that value will be set in DASH manifest. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/matroskaenc: add support for Spherical Video elementsJames Almer2017-03-09
| | | | | | | | | | Reviewed-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
* | hls: pass AVFormatContext flags to sub demuxerwm42017-03-09
| |
* | concatdec: pass AVFormatContext flags to sub demuxerwm42017-03-09
| |
* | matroskadec: cosmetics: Rearrange checks for projection-depedendent propertiesVittorio Giovara2017-03-07
| |
* | mov: Fix checking layout and loading padding for cubemapsVittorio Giovara2017-03-07
| |
* | mkv: Export bounds and padding from spherical metadataVittorio Giovara2017-03-07
| | | | | | | | Update the fate test as needed.