Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-03-29Fix all -Wformat warnings raised by DJGPPClément Bœsch
2017-03-29lavf: use av_fourcc2str() where appropriateClément Bœsch
2017-03-29lavf/ape: remove unused magic fieldClément Bœsch
2017-03-29lavf: fix usages of av_get_codec_tag_string()Clément Bœsch
2017-03-28avformat/flvdec: check FLVHeader PreviousTagSize0Steven Liu
refer to SPEC: Annex E. The FLV File Format said: E.3 TheFLVFileBody have a table: Field Type Comment PreviousTagSize0 UI32 Always 0 Reviewed-by: Bela Bodecs <bodecsb@vivanet.hu> Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
2017-03-28avformat/movenc: allow st3d and sv3d mov atoms to be written in strict ↵James Almer
unofficial mode They are unofficial extensions to the format for the time being, not an experimental feature.
2017-03-28avformat/movenc: restrict st3d and sv3d mov atoms to MODE_MP4James Almer
2017-03-28movenc: Add support for writing st3d and sv3d boxes.Aaron Colwell
Signed-off-by: James Almer <jamrial@gmail.com>
2017-03-27Merge commit 'c541a44e029e8a4f21db028c34fee3ad1c10a409'Clément Bœsch
* commit 'c541a44e029e8a4f21db028c34fee3ad1c10a409': Revert "rtmpproto: Don't include a client version in the unencrypted C1 handshake" Merged-by: Clément Bœsch <u@pkh.me>
2017-03-27avformat, ffmpeg: deprecate old rotation APIwm4
The old "API" that signaled rotation as a metadata value has been replaced by DISPLAYMATRIX side data quite a while ago. There is no reason to make muxers/demuxers/API users support both. In addition, the metadata API is dangerous, as user tags could "leak" into it, creating unintended features or bugs. ffmpeg CLI has to be updated to use the new API. In particular, we must not allow to leak the "rotate" tag into the muxer. Some muxers will catch this properly (like mov), but others (like mkv) can add it as generic tag. Note applications, which use libavformat and assume the old rotate API, will interpret such "rotate" user tags as rotate metadata (which it is not), and incorrectly rotate the video. The ffmpeg/ffplay tools drop the use of the old API for muxing and demuxing, as all muxers/demuxers support the new API. This will mean that the tools will not mistakenly interpret per-track "rotate" user tags as rotate metadata. It will _not_ be treated as regression. Unfortunately, hacks have been added, that allow the user to override rotation by setting metadata explicitly, e.g. via -metadata:s:v:0 rotate=0 See references to trac #4560. fate-filter-meta-4560-rotate0 tests this. It's easier to adjust the hack for supporting it than arguing for its removal, so ffmpeg CLI now explicitly catches this case, and essentially replaces the "rotate" value with a display matrix side data. (It would be easier for both user and implementation to create an explicit option for rotation.) When the code under FF_API_OLD_ROTATE_API is disabled, one FATE reference file has to be updated (because "rotate" is not exported anymore). Tested-by: Michael Niedermayer <michael@niedermayer.cc> Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-26avformat/mov: stop using deprecated codec flagsJames Almer
Signed-off-by: James Almer <jamrial@gmail.com>
2017-03-24Merge commit '1263b2039eb5aaf1522e9de9f07c787ab30a5f50'Clément Bœsch
* commit '1263b2039eb5aaf1522e9de9f07c787ab30a5f50': Adjust printf conversion specifiers to match variable signedness Merged-by: Clément Bœsch <u@pkh.me>
2017-03-24Merge commit 'ca1e5eea0c7b72a6e30aa6488cfeced3a4853521'Clément Bœsch
* commit 'ca1e5eea0c7b72a6e30aa6488cfeced3a4853521': Remove some pointless TRACE level debug code Merged-by: Clément Bœsch <u@pkh.me>
2017-03-24Merge commit '07eea5a5ded1141632aefecfa59dcdc26de2d7ea'Clément Bœsch
* commit '07eea5a5ded1141632aefecfa59dcdc26de2d7ea': nut: Drop pointless TRACE level debug code Merged-by: Clément Bœsch <u@pkh.me>
2017-03-24Merge commit 'c3dad1bf3b5e04e01c291b1ac41e6bef0adf2206'Clément Bœsch
* commit 'c3dad1bf3b5e04e01c291b1ac41e6bef0adf2206': nsv: Drop unnecessary TRACE level debug code Merged-by: Clément Bœsch <u@pkh.me>
2017-03-24Merge commit 'ee050797664c7c74cae262ffab05006b55d47a11'Clément Bœsch
* commit 'ee050797664c7c74cae262ffab05006b55d47a11': openssl: Support version 1.1.0. This commit is mostly a noop, see 798c6ecce50f26a53d48e2577a34fabe46b32eb9 Included the simplifications by Martin Storsjö and fixed the GET_BIO_DATA() macro to prevent a warning after the simplifications. Merged-by: Clément Bœsch <u@pkh.me>
2017-03-24Merge commit '016387fe0fe3eff1a03ec0673bf4d2967f6cad94'Clément Bœsch
* commit '016387fe0fe3eff1a03ec0673bf4d2967f6cad94': rtmpdh: Don't use the OpenSSL DH struct Merged-by: Clément Bœsch <u@pkh.me>
2017-03-24Merge commit '4b07ebf1eb13561492f7e3c30a67f34415016b3e'Clément Bœsch
* commit '4b07ebf1eb13561492f7e3c30a67f34415016b3e': mov: Update colr values Mostly noop, see a3cab3d43387add8914c1c471fc99d733227d81b Only the use of av_color_{primaries,transfer,space}_name() is merged. Merged-by: Clément Bœsch <u@pkh.me>
2017-03-24Revert "Merge commit '8e2ea691351c5079cdab245ff7bfa5c0f3e3bfe4'"James Almer
This reverts commit 1c193ac1f9cfe703d6a1c36795f309ba5d14bf6e, reversing changes made to 7ebc9f8df4035ecaa84ad4429480986e3e7597ae. Several FATE tests started failing after this merge, so it's reverted until it can be properly fixed.
2017-03-23Merge commit '8e2ea691351c5079cdab245ff7bfa5c0f3e3bfe4'James Almer
* commit '8e2ea691351c5079cdab245ff7bfa5c0f3e3bfe4': lavf: use the new bitstream filter for extracting extradata Merged-by: James Almer <jamrial@gmail.com>
2017-03-23Merge commit 'c359d624d3efc3fd1d83210d78c4152bd329b765'James Almer
* commit 'c359d624d3efc3fd1d83210d78c4152bd329b765': hevcdec: move decoder-independent declarations into a separate header Merged-by: James Almer <jamrial@gmail.com>
2017-03-23Merge commit '4abe3b049d987420eb891f74a35af2cebbf52144'Clément Bœsch
* commit '4abe3b049d987420eb891f74a35af2cebbf52144': hevc: rename hevc.[ch] to hevcdec.[ch] Merged-by: Clément Bœsch <u@pkh.me>
2017-03-23Merge commit '7d8d726be7dc46343ab1c98c339c1ed44bcb07c1'Clément Bœsch
* commit '7d8d726be7dc46343ab1c98c339c1ed44bcb07c1': rtmpproto: Don't include a client version in the unencrypted C1 handshake Merged-by: Clément Bœsch <u@pkh.me>
2017-03-23Merge commit '9f23f77a532ca9c2b7dc4b5328bc413e4f6f5b56'Clément Bœsch
* commit '9f23f77a532ca9c2b7dc4b5328bc413e4f6f5b56': rtmpproto: Don't include the libavformat version as "clientid" Merged-by: Clément Bœsch <u@pkh.me>
2017-03-23Merge commit '8b5e0d17e70400eaf5dc3845b5c1df8b2b88d830'Clément Bœsch
* commit '8b5e0d17e70400eaf5dc3845b5c1df8b2b88d830': rtmpproto: Send chunk size on the network channel Merged-by: Clément Bœsch <u@pkh.me>
2017-03-23Merge commit 'd6ded94036e43a04889f4ff2813a7f7dd60b82fe'Clément Bœsch
* commit 'd6ded94036e43a04889f4ff2813a7f7dd60b82fe': rtmpproto: Lengthen the filename buffer when receiving streams Merged-by: Clément Bœsch <u@pkh.me>
2017-03-23Merge commit '7395784ba72742b6daa62d35db4028e09f3fdf06'Clément Bœsch
* commit '7395784ba72742b6daa62d35db4028e09f3fdf06': rtmpproto: Check the return from ff_amf_read_string Merged-by: Clément Bœsch <u@pkh.me>
2017-03-23hls: consistent use of user_agentJan Berkel
This came up while debugging a problem with mpv: https://github.com/mpv-player/mpv/issues/4155 Signed-off-by: wm4 <nfxjfg@googlemail.com>
2017-03-23Merge commit 'bad4aad4037f59ba0ad656164be9ab8f7a0fa2d4'Clément Bœsch
* commit 'bad4aad4037f59ba0ad656164be9ab8f7a0fa2d4': avidec: Do not special case palette on big-endian This commit is a noop, see 64cafe340bd5ddfe704efa95cd9f21471ca12a12 Merged-by: Clément Bœsch <u@pkh.me>
2017-03-22avformat/rtmpproto: change rtmp_open from url_open to url_open2Steven Liu
use the option set by user Reported-by: Lancelot Lai <laihy23@gmail.com> Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
2017-03-22avformat/apng: set max_fps to no limit by defaultJames Almer
Should fix ticket #6252 Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
2017-03-22avformat/apng: fix setting frame delay when max_fps is set to no limitJames Almer
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
2017-03-21Merge commit '8ea35af7620e4f73f9e8c072e1c0fac9a04ec161'James Almer
* commit '8ea35af7620e4f73f9e8c072e1c0fac9a04ec161': avio: add a new flag for marking streams seekable by timestamp Merged-by: James Almer <jamrial@gmail.com>
2017-03-21Merge commit '75c1db6152c7c90c7ce28c9adb945028e5512c4f'James Almer
* commit '75c1db6152c7c90c7ce28c9adb945028e5512c4f': avio: cosmetics, prettify AVIO_SEEKABLE_NORMAL Merged-by: James Almer <jamrial@gmail.com>
2017-03-21Merge commit '83548fe894cdb455cc127f754d09905b6d23c173'James Almer
* commit '83548fe894cdb455cc127f754d09905b6d23c173': lavf: fix usage of AVIOContext.seekable Merged-by: James Almer <jamrial@gmail.com>
2017-03-21avcodec, avformat: deprecate anything related to side data mergingwm4
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>
2017-03-19Merge commit 'd42809f9835a4e9e5c7c63210abb09ad0ef19cfb'Clément Bœsch
* commit 'd42809f9835a4e9e5c7c63210abb09ad0ef19cfb': av1: Add codec_id and basic demuxing support Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19Merge commit '24130234cd9dd733116d17b724ea4c8e12ce097a'Clément Bœsch
* commit '24130234cd9dd733116d17b724ea4c8e12ce097a': rtpdec_mpeg4: validate fmtp fields Merged with fixed log message. Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19Merge commit 'be3363f664d7314d55b42860bd4077154752d769'Clément Bœsch
* commit 'be3363f664d7314d55b42860bd4077154752d769': nsv: Drop disabled cruft Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19Merge commit 'a4b1b5aa281cacde8351d9947b54ccf82ff10cd0'Clément Bœsch
* commit 'a4b1b5aa281cacde8351d9947b54ccf82ff10cd0': wc3movie: Drop unused cruft Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19Merge commit 'd9442d13033a24b14ebae149dcdb42709430e2d9'Clément Bœsch
* commit 'd9442d13033a24b14ebae149dcdb42709430e2d9': rm: Drop broken disabled cruft Merged-by: Clément Bœsch <u@pkh.me>
2017-03-17mov: Drop extra format specifier in error messageVittorio Giovara
2017-03-17spherical: Change types of bounding and pad to uint32_tVittorio Giovara
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>
2017-03-17Merge commit '0638b99cdba52554691fc668d9e477bc184c7a33'Matthieu Bouron
* 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>
2017-03-16lavf/mpegtsenc: clarify pcr_period unit of measurementLou Logan
pcr_period is in milliseconds. Signed-off-by: Lou Logan <lou@lrcd.com>
2017-03-16Merge commit 'ed1cd81076434b76f37576d4d806973476a8e96c'Clément Bœsch
* 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>
2017-03-15avformat/hlsenc: fix duration wrong when no pkt durationSteven Liu
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>
2017-03-15ffmpeg, ffprobe: don't "merge" side data into packet data by defaultwm4
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.
2017-03-15lavf/avio: Be more explicit in logging white/black list matchesAlexander Strasser
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>
2017-03-15lavf/avio: Remove unnecessary escaping of ' in string literalsAlexander Strasser
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>