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

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-04-10Merge commit '9200514ad8717c63f82101dc394f4378854325bf'Derek Buitenhuis
* commit '9200514ad8717c63f82101dc394f4378854325bf': lavf: replace AVStream.codec with AVStream.codecpar This has been a HUGE effort from: - Derek Buitenhuis <derek.buitenhuis@gmail.com> - Hendrik Leppkes <h.leppkes@gmail.com> - wm4 <nfxjfg@googlemail.com> - Clément Bœsch <clement@stupeflix.com> - James Almer <jamrial@gmail.com> - Michael Niedermayer <michael@niedermayer.cc> - Rostislav Pehlivanov <atomnuker@gmail.com> Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-24Merge commit '29c2d06d67724e994980045afa055c6c34611b30'Derek Buitenhuis
* commit '29c2d06d67724e994980045afa055c6c34611b30': cosmetics: Drop empty comment lines Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-23lavf: replace AVStream.codec with AVStream.codecparAnton Khirnov
Currently, AVStream contains an embedded AVCodecContext instance, which is used by demuxers to export stream parameters to the caller and by muxers to receive stream parameters from the caller. It is also used internally as the codec context that is passed to parsers. In addition, it is also widely used by the callers as the decoding (when demuxer) or encoding (when muxing) context, though this has been officially discouraged since Libav 11. There are multiple important problems with this approach: - the fields in AVCodecContext are in general one of * stream parameters * codec options * codec state However, it's not clear which ones are which. It is consequently unclear which fields are a demuxer allowed to set or a muxer allowed to read. This leads to erratic behaviour depending on whether decoding or encoding is being performed or not (and whether it uses the AVStream embedded codec context). - various synchronization issues arising from the fact that the same context is used by several different APIs (muxers/demuxers, parsers, bitstream filters and encoders/decoders) simultaneously, with there being no clear rules for who can modify what and the different processes being typically delayed with respect to each other. - avformat_find_stream_info() making it necessary to support opening and closing a single codec context multiple times, thus complicating the semantics of freeing various allocated objects in the codec context. Those problems are resolved by replacing the AVStream embedded codec context with a newly added AVCodecParameters instance, which stores only the stream parameters exported by the demuxers or read by the muxers.
2016-02-18cosmetics: Drop empty comment linesDiego Biurrun
2016-01-02Merge commit '69a68593ce5684409c3c4dd9a901bfd8b16925b1'Hendrik Leppkes
* commit '69a68593ce5684409c3c4dd9a901bfd8b16925b1': Remove stray line breaks from avpriv_{report_missing_feature|request_samples} Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-12-26Remove stray line breaks from avpriv_{report_missing_feature|request_samples}Diego Biurrun
2015-07-28Merge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba'Michael Niedermayer
* commit '059a934806d61f7af9ab3fd9f74994b838ea5eba': lavc: Consistently prefix input buffer defines Conflicts: doc/examples/decoding_encoding.c libavcodec/4xm.c libavcodec/aac_adtstoasc_bsf.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.h libavcodec/asvenc.c libavcodec/avcodec.h libavcodec/avpacket.c libavcodec/dvdec.c libavcodec/ffv1enc.c libavcodec/g2meet.c libavcodec/gif.c libavcodec/h264.c libavcodec/h264_mp4toannexb_bsf.c libavcodec/huffyuvdec.c libavcodec/huffyuvenc.c libavcodec/jpeglsenc.c libavcodec/libxvid.c libavcodec/mdec.c libavcodec/motionpixels.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/noise_bsf.c libavcodec/nuv.c libavcodec/nvenc.c libavcodec/options.c libavcodec/parser.c libavcodec/pngenc.c libavcodec/proresenc_kostya.c libavcodec/qsvdec.c libavcodec/svq1enc.c libavcodec/tiffenc.c libavcodec/truemotion2.c libavcodec/utils.c libavcodec/utvideoenc.c libavcodec/vc1dec.c libavcodec/wmalosslessdec.c libavformat/adxdec.c libavformat/aiffdec.c libavformat/apc.c libavformat/apetag.c libavformat/avidec.c libavformat/bink.c libavformat/cafdec.c libavformat/flvdec.c libavformat/id3v2.c libavformat/isom.c libavformat/matroskadec.c libavformat/mov.c libavformat/mpc.c libavformat/mpc8.c libavformat/mpegts.c libavformat/mvi.c libavformat/mxfdec.c libavformat/mxg.c libavformat/nutdec.c libavformat/oggdec.c libavformat/oggparsecelt.c libavformat/oggparseflac.c libavformat/oggparseopus.c libavformat/oggparsespeex.c libavformat/omadec.c libavformat/rawdec.c libavformat/riffdec.c libavformat/rl2.c libavformat/rmdec.c libavformat/rtpdec_latm.c libavformat/rtpdec_mpeg4.c libavformat/rtpdec_qdm2.c libavformat/rtpdec_svq3.c libavformat/sierravmd.c libavformat/smacker.c libavformat/smush.c libavformat/spdifenc.c libavformat/takdec.c libavformat/tta.c libavformat/utils.c libavformat/vqf.c libavformat/westwood_vqa.c libavformat/xmv.c libavformat/xwma.c libavformat/yop.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27lavc: Consistently prefix input buffer definesVittorio Giovara
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-04-20Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'Michael Niedermayer
* commit '1a3eb042c704dea190c644def5b32c9cee8832b8': Replace av_dlog with normal av_log at trace level Conflicts: ffplay.c libavdevice/fbdev_dec.c libavfilter/avfilter.c libavfilter/internal.h libavfilter/setpts.c libavfilter/src_movie.c libavfilter/vf_crop.c libavfilter/vf_drawtext.c libavfilter/vf_fieldorder.c libavformat/assdec.c libavformat/avidec.c libavformat/flvdec.c libavformat/http.c libavformat/ipmovie.c libavformat/isom.c libavformat/mov.c libavformat/mpegenc.c libavformat/mpegts.c libavformat/mpegtsenc.c libavformat/mux.c libavformat/mxfdec.c libavformat/nsvdec.c libavformat/oggdec.c libavformat/r3d.c libavformat/rtspdec.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-19Replace av_dlog with normal av_log at trace levelVittorio Giovara
This applies to every library where performance is not critical.
2015-03-09Merge commit 'bfeb83a8b7d3fcf09a54d8dbc9c521e10bb17530'Michael Niedermayer
* commit 'bfeb83a8b7d3fcf09a54d8dbc9c521e10bb17530': rtpdec_hevc: Drop extra sanity check for size of input packet Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-09rtpdec_hevc: Drop extra sanity check for size of input packetVittorio Giovara
In this case len is always at least 3, since it is checked against RTP_HEVC_PAYLOAD_HEADER_SIZE + 1 before entering the switch block. Bug-Id: CID 1238784
2015-02-25Merge commit 'ec96a89c3e507cf0fb1f2b159b28a53f2bad9a74'Michael Niedermayer
* commit 'ec96a89c3e507cf0fb1f2b159b28a53f2bad9a74': rtpdec: Don't pass non-const pointers to fmtp attribute parsing functions Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-25Merge commit '3567b91e49c6ae101c9a35c90f46b8ad9890ac15'Michael Niedermayer
* commit '3567b91e49c6ae101c9a35c90f46b8ad9890ac15': rtpdec_hevc: Share the implementation of fragmented packets with h264 Conflicts: libavformat/rtpdec_h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-25Merge commit 'f3449062a8d100ac4f703647336c32b126aa99f1'Michael Niedermayer
* commit 'f3449062a8d100ac4f703647336c32b126aa99f1': rtpdec_hevc: Reduce indentation level by returning early on errors Conflicts: libavformat/rtpdec_hevc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-25Merge commit '8633fb47db2ec39eb8bd1bd65302af75a94ff5d0'Michael Niedermayer
* commit '8633fb47db2ec39eb8bd1bd65302af75a94ff5d0': rtpdec_hevc: Share the implementation of parsing a=framesize with h264 Conflicts: libavformat/rtpdec_h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-25Merge commit '5956f489d0452ff6dea6b6b81b4fa8e596fc5684'Michael Niedermayer
* commit '5956f489d0452ff6dea6b6b81b4fa8e596fc5684': rtpdec_hevc: Add asterisks at the start of each long comment line Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-25Merge commit '5d8cae45737bed6239bd6b6e0698802dbe1463c8'Michael Niedermayer
* commit '5d8cae45737bed6239bd6b6e0698802dbe1463c8': rtpdec: Get rid of all trivial .alloc/.free functions Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-25Merge commit '2b982e92f42a6e661d90b12b6592cd13cae496d4'Michael Niedermayer
* commit '2b982e92f42a6e661d90b12b6592cd13cae496d4': rtpdec: Set need_parsing via a handler field Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-25rtpdec: Don't pass non-const pointers to fmtp attribute parsing functionsMartin Storsjö
This makes it clear that the individual parsing functions can't touch the parsed out value. Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-25Merge commit '3cd5828fc0007e6d056067444de053a34ddedd02'Michael Niedermayer
* commit '3cd5828fc0007e6d056067444de053a34ddedd02': rtpdec: Add missing trailing commas Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-24rtpdec_hevc: Share the implementation of fragmented packets with h264Martin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-24rtpdec_hevc: Reduce indentation level by returning early on errorsMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-24rtpdec_hevc: Share the implementation of parsing a=framesize with h264Martin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-24rtpdec_hevc: Add asterisks at the start of each long comment lineMartin Storsjö
This is the common style for such comments. Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-24rtpdec: Get rid of all trivial .alloc/.free functionsMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-24rtpdec: Set need_parsing via a handler fieldMartin Storsjö
This avoids implementing a full function just to set this one field. Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-24rtpdec: Add missing trailing commasMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-23Merge commit 'fe208ca54b0d3b6bbe1c660d371bb2cc6cf40ffc'Michael Niedermayer
* commit 'fe208ca54b0d3b6bbe1c660d371bb2cc6cf40ffc': rtpdec_hevc: Skip 1 byte (DOND) instead of 2 (DONL) between aggregation units Conflicts: libavformat/rtpdec_hevc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-23rtpdec_hevc: Skip 1 byte (DOND) instead of 2 (DONL) between aggregation unitsMartin Storsjö
Only the first aggregation unit has 2 bytes (DONL) prepended, if such a field is in use. Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-21Merge commit 'cbdd1806ead8758949f22b4e4f214b035c78e2b9'Michael Niedermayer
* commit 'cbdd1806ead8758949f22b4e4f214b035c78e2b9': rtpdec_hevc: Implement parsing of aggregated packets Conflicts: libavformat/rtpdec_hevc.c See: b6f577dbb2afde4111a1820435ab2c5afbf78e12 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-21Merge commit 'b878ba03e7e088777cc5083766e0b2a293e716ee'Michael Niedermayer
* commit 'b878ba03e7e088777cc5083766e0b2a293e716ee': rtpdec_hevc: Initialize variables to silence false positive compiler warnings Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-21Merge commit '10e2d8b5562d8729e4eefbcec63a11eb8a0c502c'Michael Niedermayer
* commit '10e2d8b5562d8729e4eefbcec63a11eb8a0c502c': rtpdec_hevc: Use a shared function for parsing parameter sets Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-21rtpdec_hevc: Implement parsing of aggregated packetsThomas Volkert
With significant changes by Martin Storsjö, to use the shared function instead of reimplementing it. Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-21rtpdec_hevc: Initialize variables to silence false positive compiler warningsMartin Storsjö
For some reason, clang didn't warn about this prior to using the shared function. Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-21rtpdec_hevc: Use a shared function for parsing parameter setsMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-12rtpdec_hevc: correct parsing of aggregated packetsThomas Volkert
reported by tim dot yao at amlogic dot com Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-17avformat/rtpdec_hevc: Fix 2 "may be used uninitialized in this function" ↵Michael Niedermayer
warnings Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-21Merge commit '350ed1829268d343b791208c8fd1cddd44d52a8e'Michael Niedermayer
* commit '350ed1829268d343b791208c8fd1cddd44d52a8e': rtpdec_hevc: drop unnecessary check Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-20rtpdec_hevc: drop unnecessary checkVittorio Giovara
len is always >=1 in that case. Bug-Id: CID 1238784
2014-10-16Merge commit 'ced7238cd01cc2199acf9225305628641a27c1d7'Michael Niedermayer
* commit 'ced7238cd01cc2199acf9225305628641a27c1d7': rtpdec_hevc: Use av_realloc instead of av_malloc+memcpy Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-16Merge commit '752e71e74f50e7a6f9a19edb8e775b2ea2fb94d8'Michael Niedermayer
* commit '752e71e74f50e7a6f9a19edb8e775b2ea2fb94d8': rtpdec_hevc: Rename a variable for clarity Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15rtpdec_hevc: Use av_realloc instead of av_malloc+memcpyMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-10-15rtpdec_hevc: Rename a variable for clarityMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-10-15Merge commit '9b7f932ee568cadfc0f556a061fcc00cb63f9780'Michael Niedermayer
* commit '9b7f932ee568cadfc0f556a061fcc00cb63f9780': rtpdec_hevc: Parse out of band vps/sps/pps/sei from fmtp lines Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15rtpdec_hevc: Parse out of band vps/sps/pps/sei from fmtp linesMartin Storsjö
These are assembled into extradata in the order vps/sps/pps/sei. Signed-off-by: Martin Storsjö <martin@martin.st>
2014-09-24Merge commit 'c463dfc7e49929a9891884312b23b27d14729c51'Michael Niedermayer
* commit 'c463dfc7e49929a9891884312b23b27d14729c51': rtpdec_hevc: Drop a duplicated, nonstandard entry Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-24rtpdec_hevc: Drop a duplicated, nonstandard entryVittorio Giovara
The RFC spec draft only specifies the "H265" name - there is no specification saying how to interpret "HEVC" (if such a packet format is specified it could be an entirely different format). Since this is a very new standard (still a draft), there is little need for compatibility with existing, broken implementations. Therefore remove the extra alias, to avoid the risk of encouraging incorrect usage. Intentionally keeping the ff_hevc_dynamic_handler name for the handler, to use "hevc" consistently as name for the codec instead of "h265" within the library internals as long as there only is one single variant in actual use. Signed-off-by: Martin Storsjö <martin@martin.st>
2014-09-21rtpdec_hevc: do not print an error message if the received packet has a ↵Thomas Volkert
valid header but lacks additional bytes as payload Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-03Merge commit '95e177eeb21f3e968aa9353bc69d1946966cc835'Michael Niedermayer
* commit '95e177eeb21f3e968aa9353bc69d1946966cc835': rtpdec: HEVC/H.265 support Conflicts: Changelog libavformat/rtpdec_hevc.c libavformat/version.h See: 96b2ba68c4aef4e92b3e9de87d1fb94f2fb659f0 Merged-by: Michael Niedermayer <michaelni@gmx.at>