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
2018-02-22avformat/mpegenc - log error msgs for unsupported LPCM streamsGyan Doshi
The MPEG-PS muxer only accepts PCM streams having up to 8 channels and the following sampling rates: 32/44.1/48/96 kHz. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-02-16avformat/mpegenc - accept PCM_DVD streamsGyan Doshi
PCM_S16BE stream packets in MPEG-PS have a 3-byte header and are recognized as PCM_DVD by the demuxer which prevents their correct remuxing in MPEG-1/2 PS. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-01-30avformat/mpegenc - fix typo in VBV warningGyan Doshi
Default VBV buffer size is 230KB, not 130KB. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-12-22avformat/mpegenc: Check for av_mallocz() failureMichael Niedermayer
Fixes CID1257787 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-21Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'Clément Bœsch
* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb': cosmetics: Fix spelling mistakes Merged-by: Clément Bœsch <u@pkh.me>
2016-05-04cosmetics: Fix spelling mistakesVittorio Giovara
Signed-off-by: Diego Biurrun <diego@biurrun.de>
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-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.
2015-12-17Merge commit '8bcadaacc2b8dc3c5d6569835a5ca20e62d3efca'Hendrik Leppkes
* commit '8bcadaacc2b8dc3c5d6569835a5ca20e62d3efca': mpegenc: use the CPB props side data Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-12-06mpegenc: use the CPB props side dataAnton Khirnov
Do not access the encoder options, since it makes no sense when the AVStream codec context is not the encoding context.
2015-08-27lavf/mpegenc: provide better feedback in case of invalid media typeStefano Sabatini
2015-05-25avformat/mpegenc: Replace *0.7 by *7/10Michael Niedermayer
This avoids another float computation, avoiding a potential source of rounding issues Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-25avformat/mpegenc: Do not use floats for vcd_padding_bitrateMichael Niedermayer
This reduces the risk for rounding differences. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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-01avformat/mpegenc: Ignore max_delay if no other options remainMichael Niedermayer
Fixes assertion failure Fixes Ticket4335 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-14Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'Michael Niedermayer
* commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e': avformat: Don't anonymously typedef structs Conflicts: libavformat/adtsenc.c libavformat/aiffenc.c libavformat/avidec.c libavformat/gif.c libavformat/iff.c libavformat/img2dec.c libavformat/jvdec.c libavformat/matroskadec.c libavformat/udp.c libavformat/wtvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-14avformat: Don't anonymously typedef structsDiego Biurrun
2015-01-08Merge commit '01168bf1405ddbf671f1074a927b951b8777adbb'Michael Niedermayer
* commit '01168bf1405ddbf671f1074a927b951b8777adbb': mpeg: Remove unused field Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-07mpeg: Remove unused fieldLuca Barbato
2014-12-21avformat/mpegenc: Use av_freep() to avoid leaving stale pointers in memoryMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-19avformat/mpegenc: replace always enabled asserts by av_assert0()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-24avformat/mpegenc: assert that premux_packet is non nullMichael Niedermayer
Based on: 065923b0781b06a2604f69f4e2c2407b7750a854 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-24mpegenc: prevent a NULL pointer dereferenceVittorio Giovara
CC: libav-stable@libav.org Bug-Id: CID 29261
2014-08-27mpegenc: limit the maximum muxrateAnton Khirnov
It is written to the file as a 22-bit value. CC: libav-stable@libav.org
2014-08-26Merge commit '4e9e6fa99f3ff83cedbf6c378d62065ae419a3b9'Michael Niedermayer
* commit '4e9e6fa99f3ff83cedbf6c378d62065ae419a3b9': mpeg: Write H264 streams at offset 2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-26mpeg: Write H264 streams at offset 2Luca Barbato
It hints that the content is H264 according to HD-DVD.
2014-08-10Merge commit '8c6f430291374cf6d2cfb85cdbb809803b5a7d83'Michael Niedermayer
* commit '8c6f430291374cf6d2cfb85cdbb809803b5a7d83': mpeg: Suppress a compiler warning on callback type Conflicts: libavformat/mpegenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-09mpeg: Suppress a compiler warning on callback typeLuca Barbato
2014-08-08Merge commit 'e4c9e59a4547adaaa0ce9f25b0d0c5b91ae15472'Michael Niedermayer
* commit 'e4c9e59a4547adaaa0ce9f25b0d0c5b91ae15472': mpeg: K&R formatting cosmetics Conflicts: libavformat/mpegenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08mpeg: K&R formatting cosmeticsLuca Barbato
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-05-08lavf: use av_fifo_freepLukasz Marek
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-04-16avformat/mpegenc: try to improve the VBV buffer warningMichael Niedermayer
Maybe fixes Ticket 3494 Part of the message suggested by: rogerdpack Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-24lavf/mpegenc: Print a warning if ac3, pcm_s16be or dts are muxed into mpeg1.Carl Eugen Hoyos
Some media players don't play the resulting files. The warning should help users to avoid the issues described in ticket #1720.
2013-11-24Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: Add missing #includes for *INT64_MAX and *INT64_C Conflicts: ffmpeg.c ffmpeg_filter.c ffplay.c libavformat/assdec.c libavformat/avidec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-24Add missing #includes for *INT64_MAX and *INT64_CDiego Biurrun
2013-09-29avformat/mpegenc: check, warn and clip muxrate to syntactical possible valuesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-29avformat/mpegenc: check, warn and clip VBV value to within syntactically ↵Michael Niedermayer
possible values Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-29avformat/mpegenc: fix muxrates AVOption maximum valueMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-26avformat/mpegenc: minor simplification / use AV_WB16()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-26avformat/mpegenc: Better heuristic for ordering packetsMichael Niedermayer
This prevents underflows in quite constrained cases Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-26avformat/mpegenc: Better default for max_delayMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-26avformat/mpegenc: change assert to av_assert0Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-26avformat/mpegenc: improve field names in underflow error messageMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06Merge commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43'Michael Niedermayer
* commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43': avformat: Add av_cold attributes to init functions missing them Conflicts: libavformat/rtpdec_xiph.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05avformat: Add av_cold attributes to init functions missing themDiego Biurrun
2013-01-04mpegpsenc: avoid shifting dts/ptsMichael Niedermayer
Only shift if needed to avoid negative scr when requested or for dvd. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-04mpegpsenc: show first SCR/DTS at debug levelMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-04mpegpsenc: move preload recalculation to where its neededMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-04mpegpsenc: Fix SCR handling for DVDMichael Niedermayer
This makes the initial SCR equal 0 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>