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
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-14avformat: add AVFormatContext to ff_get_extradata()Paul B Mahol
Needed for av_log() inside that function. Signed-off-by: Paul B Mahol <onemda@gmail.com>
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-10-27Merge commit 'ce70f28a1732c74a9cd7fec2d56178750bd6e457'Hendrik Leppkes
* commit 'ce70f28a1732c74a9cd7fec2d56178750bd6e457': avpacket: Replace av_free_packet with av_packet_unref Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-10-26avpacket: Replace av_free_packet with av_packet_unrefLuca Barbato
`av_packet_unref` matches the AVFrame ref-counted API and can be used as a drop in replacement. Deprecate `av_free_packet`.
2015-05-12avformat/idcin: Remove redundant chunk size checkMichael Niedermayer
Fixes CID1138438 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20avformat/idcin: Use 64bit for ret to avoid overflowMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-20idcin: fix return checkVittorio Giovara
CC: libav-stable@libav.org Bug-Id: CID 732198
2014-08-24Correct few "ffmpeg" typosPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2014-08-08replace calls to url_feof() with avio_feof()James Almer
Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-25avformat/idcin: use ff_get_extradata()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-08avformat/idcin: check the decompressed frame size during probingMichael Niedermayer
Fixes probetest failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-14avformat: use ff_alloc_extradata()Paul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-02idcin: check return value of av_malloc()Paul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-06-19Autodetect idcin only if audio properties allow decoding.Carl Eugen Hoyos
Fixes ticket #2688.
2013-05-05Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'Michael Niedermayer
* commit 'e0f8be6413b6a8d334d6052e610af32935c310af': avformat: Add AVPROBE_SCORE_EXTENSION define and use where appropriate Conflicts: libavformat/ac3dec.c libavformat/avformat.h libavformat/avs.c libavformat/m4vdec.c libavformat/mov.c libavformat/mp3dec.c libavformat/mpeg.c libavformat/mpegvideodec.c libavformat/psxstr.c libavformat/pva.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-04avformat: Add AVPROBE_SCORE_EXTENSION define and use where appropriateDiego Biurrun
2013-05-04Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7'Michael Niedermayer
* commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7': silly typo fixes Conflicts: doc/protocols.texi libavcodec/aacpsy.c libavformat/utils.c tools/patcheck Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03silly typo fixesDiego Biurrun
2013-03-12Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241'Michael Niedermayer
* commit '7b89cd20d844cbe763ca34e63e99d110043cf241': eamad: allocate a dummy reference frame when the real one is missing Replace remaining includes of audioconvert.h with channel_layout.h Replace some forgotten instances of PIX_FMT_* with AV_PIX_FMT_*. Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-08Replace remaining includes of audioconvert.h with channel_layout.hAnton Khirnov
2013-01-17Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: idcin: fix memleaks in idcin_read_packet() Conflicts: libavformat/idcin.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-16idcin: fix memleaks in idcin_read_packet()Justin Ruggles
Fixes fate-id-cin-video failures when running FATE with valgrind.
2013-01-10idcin: fix memleakMichael Niedermayer
Found-by: valgrind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-10Merge commit 'ed79093222ceb42f0c3a39095a69af0b32be5450'Michael Niedermayer
* commit 'ed79093222ceb42f0c3a39095a69af0b32be5450': rtpdec: Add a terminating null byte at the end of the SDES/CNAME yuv4mpeg: do not use deprecated functions oggdec: fix faulty cleanup prototype idcin: return 0 from idcin_read_packet() on success. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-10Merge commit '5d0450461ff729be5f531d333d29754155e406c5'Michael Niedermayer
* commit '5d0450461ff729be5f531d333d29754155e406c5': idcin: better error handling idcin: check for integer overflow when calling av_get_packet() Conflicts: libavformat/idcin.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-10Merge commit '7040e479a1530b2eda4b89a182d5eb50a77bd907'Michael Niedermayer
* commit '7040e479a1530b2eda4b89a182d5eb50a77bd907': idcin: allow seeking back to the first packet idcin: set AV_PKT_FLAG_KEY for video packets with a palette Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-10Merge commit 'ccc0ffb1ba3fc1adb05a9f56dfc26131e61db3fb'Michael Niedermayer
* commit 'ccc0ffb1ba3fc1adb05a9f56dfc26131e61db3fb': idcin: set start_time and packet duration instead of manually tracking pts. idcin: set channel_layout Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-10Merge commit '12c2530b1d87fa94f81ea97df575b77c825e6f4f'Michael Niedermayer
* commit '12c2530b1d87fa94f81ea97df575b77c825e6f4f': idcin: fix check for presence of an audio stream idcin: validate header parameters Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-09idcin: better error handlingJustin Ruggles
Add some additional checks for EOF and print error messages on an incomplete header or packet. FATE reference updated for id-cin-video due to the demuxer no longer returning a partial video packet at EOF.
2013-01-09idcin: return 0 from idcin_read_packet() on success.Justin Ruggles
This matches the AVInputFormat.read_packet() API.
2013-01-09idcin: allow seeking back to the first packetJustin Ruggles
Also, do not allow seek-by-byte, as there is no way to find the next packet boundary.
2013-01-09idcin: set start_time and packet duration instead of manually tracking pts.Justin Ruggles
Also, use 1 / sample_rate for audio stream time_base.
2013-01-09idcin: fix check for presence of an audio streamJustin Ruggles
2013-01-09idcin: check for integer overflow when calling av_get_packet()Justin Ruggles
chunk_size is unsigned 32-bit, but av_get_packet() takes a signed int as the packet size.
2013-01-09idcin: set AV_PKT_FLAG_KEY for video packets with a paletteJustin Ruggles
2013-01-09idcin: set channel_layoutJustin Ruggles
2013-01-09idcin: validate header parametersJustin Ruggles
Avoids using unsupported parameters and signed integer overflows.
2012-10-15idcin: check chunk_size value before using itPaul B Mahol
Fixes integer overflow. Fixes CID732223. Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-08-08Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer
* commit '36ef5369ee9b336febc2c270f8718cec4476cb85': Replace all CODEC_ID_* with AV_CODEC_ID_* lavc: add AV prefix to codec ids. Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/examples/muxing.c ffmpeg.c ffprobe.c ffserver.c libavcodec/8svx.c libavcodec/avcodec.h libavcodec/dnxhd_parser.c libavcodec/dvdsubdec.c libavcodec/error_resilience.c libavcodec/h263dec.c libavcodec/libvorbisenc.c libavcodec/mjpeg_parser.c libavcodec/mjpegenc.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pcm.c libavcodec/r210dec.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/version.h libavdevice/alsa-audio-dec.c libavdevice/bktr.c libavdevice/v4l2.c libavformat/asfdec.c libavformat/asfenc.c libavformat/avformat.h libavformat/avidec.c libavformat/caf.c libavformat/electronicarts.c libavformat/flacdec.c libavformat/flvdec.c libavformat/flvenc.c libavformat/framecrcenc.c libavformat/img2.c libavformat/img2dec.c libavformat/img2enc.c libavformat/ipmovie.c libavformat/isom.c libavformat/matroska.c libavformat/matroskadec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/movenc.c libavformat/mp3dec.c libavformat/mpeg.c libavformat/mpegts.c libavformat/mxf.c libavformat/mxfdec.c libavformat/mxfenc.c libavformat/nsvdec.c libavformat/nut.c libavformat/oggenc.c libavformat/pmpdec.c libavformat/rawdec.c libavformat/rawenc.c libavformat/riff.c libavformat/sdp.c libavformat/utils.c libavformat/vocenc.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-07Replace all CODEC_ID_* with AV_CODEC_ID_*Anton Khirnov
2012-07-31Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: avformat: Drop pointless "format" from container long names swscale: bury one more piece of inline asm under HAVE_INLINE_ASM. wv: K&R formatting cosmetics configure: Add missing descriptions to help output h264_ps: declare array of colorspace strings on its own line. fate: amix: specify f32 sample format for comparison tiny_psnr: support 32-bit float samples eamad/eatgq/eatqi: call special EA IDCT directly eamad: remove use of MpegEncContext mpegvideo: remove unnecessary inclusions of faandct.h af_asyncts: avoid overflow in out_size with large delta values af_asyncts: add first_pts option Conflicts: configure libavcodec/eamad.c libavcodec/h264_ps.c libavformat/crcenc.c libavformat/ffmdec.c libavformat/ffmenc.c libavformat/framecrcenc.c libavformat/md5enc.c libavformat/nutdec.c libavformat/rawenc.c libavformat/yuv4mpeg.c tests/tiny_psnr.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-30avformat: Drop pointless "format" from container long namesDiego Biurrun
2012-01-28Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (71 commits) movenc: Allow writing to a non-seekable output if using empty moov movenc: Support adding isml (smooth streaming live) metadata libavcodec: Don't crash in avcodec_encode_audio if time_base isn't set sunrast: Document the different Sun Raster file format types. sunrast: Add a check for experimental type. libspeexenc: use AVSampleFormat instead of deprecated/removed SampleFormat lavf: remove disabled FF_API_SET_PTS_INFO cruft lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft lavf: remove disabled FF_API_REORDER_PRIVATE cruft lavf: remove disabled FF_API_SEEK_PUBLIC cruft lavf: remove disabled FF_API_STREAM_COPY cruft lavf: remove disabled FF_API_PRELOAD cruft lavf: remove disabled FF_API_NEW_STREAM cruft lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft lavf: remove disabled FF_API_MUXRATE cruft lavf: remove disabled FF_API_FILESIZE cruft lavf: remove disabled FF_API_TIMESTAMP cruft lavf: remove disabled FF_API_LOOP_OUTPUT cruft lavf: remove disabled FF_API_LOOP_INPUT cruft lavf: remove disabled FF_API_AVSTREAM_QUALITY cruft ... Conflicts: doc/APIchanges libavcodec/8bps.c libavcodec/avcodec.h libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/options.c libavcodec/sunrast.c libavcodec/utils.c libavcodec/version.h libavcodec/x86/h264_deblock.asm libavdevice/libdc1394.c libavdevice/v4l2.c libavformat/avformat.h libavformat/avio.c libavformat/avio.h libavformat/aviobuf.c libavformat/dv.c libavformat/mov.c libavformat/utils.c libavformat/version.h libavformat/wtv.c libavutil/Makefile libavutil/file.c libswscale/x86/input.asm libswscale/x86/swscale_mmx.c libswscale/x86/swscale_template.c tests/ref/lavf/ffm Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-27lavf: remove AVFormatParameters from AVFormatContext.read_header signatureAnton Khirnov
2012-01-07Fix OOM error condition in idcin demuxer.Carl Eugen Hoyos
2011-12-24Make the palette in Quake II CIN files opaque and increase its dynamics.Carl Eugen Hoyos
2011-12-01Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: rtpdec: Templatize the code for different g726 bitrate variants rv40: move loop filter to rv34dsp context lavf: make av_set_pts_info private. rtpdec: Add support for G726 audio rtpdec: Add an init function that can do custom codec context initialization avconv: make copy_tb on by default. matroskadec: don't set codec timebase. rmdec: don't set codec timebase. avconv: compute next_pts from input packet duration when possible. lavf: estimate frame duration from r_frame_rate. avconv: update InputStream.pts in the streamcopy case. Conflicts: avconv.c libavdevice/alsa-audio-dec.c libavdevice/bktr.c libavdevice/fbdev.c libavdevice/libdc1394.c libavdevice/oss_audio.c libavdevice/v4l.c libavdevice/v4l2.c libavdevice/vfwcap.c libavdevice/x11grab.c libavformat/au.c libavformat/eacdata.c libavformat/flvdec.c libavformat/mpegts.c libavformat/mxfenc.c libavformat/rtpdec_g726.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>