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-04-07lavf: use the new bitstream filter for extracting extradataJames Almer
This merges commits 8e2ea691351c5079cdab245ff7bfa5c0f3e3bfe4 and 096a8effa3f8f3455292c958c3ed07e798def7bd by Anton Khirnov, with the following change: - extract_extradata_check() is added to know if the codec is supported by the bsf before trying to initialize it. This behaviour is similar to the old AVCodecParser.split checks. The FATE reference changes are due to the filtered out NAL units that the old AVCodecParser.split implementation left alone. Decoding is unchanged as the functions that parse extradata simply ignored said unnecessary NAL units. Signed-off-by: James Almer <jamrial@gmail.com>
2017-04-06avformat/dump : Display Content Light Level metadataSteve Lhomme
Signed-off-by: James Almer <jamrial@gmail.com>
2017-04-06libavformat/mov: Fix memory leak, need to free the chapter tracks arrayThierry Foucu
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-04-06avformat/ftp: Solve a crash bug when network occur a exceptiontiejun.peng@foxmail.com
This fixes a proble where ffmpeg would cause crash to do a seek when the network disconnect. The log like this: 01-01 10:53:03.441 6580 6580 F DEBUG : backtrace: 01-01 10:53:03.441 6580 6580 F DEBUG : #00 pc 0002942e /system/lib/libavformat.so (ffurl_write+9) Signed-off-by: tiejun.peng <tiejun.peng@foxmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-04-05rtp: rfc4175: add handler for YCbCr-4:2:2Damien Riegel
This adds partial support for the RFC 4175 (raw video over RTP). The only supported formats are the YCbCr-4:2:2 8 bit because it's natively supported by FFmpeg with pixel format UYVY, and 10 bit which requires the vrawdepay codec to convert the payload in a format handled by FFmpeg. Signed-off-by: Damien Riegel <damien.riegel@savoirfairelinux.com> Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2017-04-04Merge commit '537b5b773b317af79d3a5b576ee9683e15ed84f6'James Almer
* commit '537b5b773b317af79d3a5b576ee9683e15ed84f6': rtmpdh: Do global initialization before running the test Merged-by: James Almer <jamrial@gmail.com>
2017-04-04avformat/mov: Check creation_time for overflowMichael Niedermayer
Fixes integer overflow Fixes: 701640 Found-by: Found-by: Thomas Guilbert <tguilbert@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-04-02Bump versions for master after 3.3Michael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-04-02Bump minor for 3.3Michael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-04-01avformat/oggparsedaala: Do not leave an invalid value in gpshiftMichael Niedermayer
Fixes: undefined behavior Fixes: 702974 Found-by: Thomas Guilbert <tguilbert@google.com> Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-04-01avformat/oggparsedaala: Check duration for AV_NOPTS_VALUEMichael Niedermayer
This avoids an integer overflow the solution matches oggparsevorbis.c and 45581ed15d2ad5955e24d809820c1675da68f500 Fixes: 700242 Found-by: Thomas Guilbert <tguilbert@google.com> Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-04-01Merge commit 'd860a3cc0a12360a92b9ffd179a0c34413beaf88'Clément Bœsch
* commit 'd860a3cc0a12360a92b9ffd179a0c34413beaf88': crypto: Add encryption support See 00d4013d9f841c189a2f10dd05526ca40129b880 Merged-by: Clément Bœsch <u@pkh.me>
2017-04-01Merge commit '3cc3463f306f425f76bd962755df1132eeac6dfa'Clément Bœsch
* commit '3cc3463f306f425f76bd962755df1132eeac6dfa': avisynth: Support pix_fmts added to AviSynth+ This commit is mostly a noop, see 92916e8542e425ca20daddb490261a5818643206. Cosmetics and a small fix are merged. Merged-by: Clément Bœsch <u@pkh.me>
2017-03-31Merge commit '800d91d348c89fc8ca3fbec7696ab1ec8787acc6'James Almer
* commit '800d91d348c89fc8ca3fbec7696ab1ec8787acc6': Drop pointless void* casts Merged-by: James Almer <jamrial@gmail.com>
2017-03-31avformat/dump: use av_spherical_projection_name() to print spherical ↵James Almer
projection names Reviewed-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
2017-03-31lavf/amr: Return AVERROR_EOF on EOF.Carl Eugen Hoyos
Fixes ticket #6280.
2017-03-31lavf/mov.c: Add -advanced_editlist option for mov format.Sasi Inguva
Adding an MOV format option to turn on/off the editlist supporting code, introduced in https://github.com/FFmpeg/FFmpeg/commit/ca6cae73db207f17a0d5507609de12842d8f0ca3 Signed-off-by: Sasi Inguva <isasi@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-31Bump minor versions for master after release/3.3 branchpointMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-31Bump minor versions for staring release/3.3 branchMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-31Merge commit '67deba8a416d818f3d95aef0aa916589090396e2'Clément Bœsch
* commit '67deba8a416d818f3d95aef0aa916589090396e2': Use avpriv_report_missing_feature() where appropriate Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-31avformat/mov: Init ref_sc / ref_st to NULLMichael Niedermayer
This is more robust in case some change or corner case causes them to be dereferenced before being set Fixes CID1396274, CID1396275 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-31avformat/libopenmpt: Check for avio_size() failureMichael Niedermayer
Fixes CID1396850 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30avformat/mux: Check return code of av_packet_split_side_data()Michael Niedermayer
Fixes CID1403225 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30avformat/nut: Add HEVC and Opus supportLeo Izen
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30Merge commit '67351924fa91dea4339109100a4c0689f006581f'Clément Bœsch
* commit '67351924fa91dea4339109100a4c0689f006581f': Drop unreachable break and return statements Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-29Merge commit 'f4ca8ea92a8b36fe723412aefafc1b2fa89f8dc6'Clément Bœsch
* commit 'f4ca8ea92a8b36fe723412aefafc1b2fa89f8dc6': rtmpproto: Restructure zlib code to avoid unreachable code warning Merged-by: Clément Bœsch <u@pkh.me>
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>