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
2015-08-18Move ff_dlog from lavc to lavu.Ronald S. Bultje
2015-08-04avcodec/internal: improve min_size documentation for ff_alloc_packet2()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
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-07-27avcodec/internal: Deprecate ff_alloc_packet() in favor of ff_alloc_packet2()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-27avcodec: Add a min size parameter to ff_alloc_packet2()Michael Niedermayer
This parameter can be used to inform the allocation code about how much downsizing might occur, and can be used to optimize how to allocate the packet Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-22Replace AV_PKT_DATA_QUALITY_FACTOR by AV_PKT_DATA_QUALITY_STATSMichael Niedermayer
The stats are a superset of the quality factor, also allowing the picture type and encoder "PSNR" stats to be exported This also replaces the native by fixed little endian order for the affected side data AV_PKT_DATA_QUALITY_FACTOR is left as a synonym of AV_PKT_DATA_QUALITY_STATS Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-17lavc: Allow 64 channels internally.Carl Eugen Hoyos
2015-07-03Merge commit '910247f1720c6aae422723c05dac6d0b19f20bec'Michael Niedermayer
* commit '910247f1720c6aae422723c05dac6d0b19f20bec': lavc: Deprecate avctx.{inter,intra}_quant_bias Conflicts: libavcodec/mpegvideo_enc.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-03lavc: Deprecate avctx.{inter,intra}_quant_biasVittorio Giovara
They are used by dnxhd and mpegvideo_enc exclusively, move them to codec private options instead. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-04-24Merge commit '5bba3ab0cf7a0238ee1ea31ca2da08ce860fd8f9'Michael Niedermayer
* commit '5bba3ab0cf7a0238ee1ea31ca2da08ce860fd8f9': internal: Make dlog/tlog a no-op when disabled Conflicts: libavcodec/internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-24internal: Make dlog/tlog a no-op when disabledVittorio Giovara
Improves Coverity analysis, avoiding "double semicolon" CIDs.
2015-04-20avcodec/internal: Fix ff_dlog() define like av_dlog()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20Merge commit '6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25'Michael Niedermayer
* commit '6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25': lavc: Replace av_dlog and tprintf with internal macros Conflicts: libavcodec/aacdec.c libavcodec/audio_frame_queue.c libavcodec/bitstream.c libavcodec/dcadec.c libavcodec/dnxhddec.c libavcodec/dvbsubdec.c libavcodec/dvdec.c libavcodec/dvdsubdec.c libavcodec/get_bits.h libavcodec/gifdec.c libavcodec/h264.h libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_loopfilter.c libavcodec/h264_refs.c libavcodec/imc.c libavcodec/interplayvideo.c libavcodec/jpeglsdec.c libavcodec/libopencore-amr.c libavcodec/mjpegdec.c libavcodec/mpeg12dec.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_parser.c libavcodec/pngdec.c libavcodec/ratecontrol.c libavcodec/rv10.c libavcodec/svq1dec.c libavcodec/vqavideo.c libavcodec/wmadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-19lavc: Replace av_dlog and tprintf with internal macrosVittorio Giovara
2015-04-05Merge commit '5637ff01218a44fcc1fff9b4382a15a6470abcc9'Michael Niedermayer
* commit '5637ff01218a44fcc1fff9b4382a15a6470abcc9': libavcodec: Clarify the documentation of the internal codec capability flags Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-05libavcodec: Clarify the documentation of the internal codec capability flagsMartin Storsjö
The previous documentation was very vague and almost misleading. Signed-off-by: Martin Storsjö <martin@martin.st>
2015-03-31avcodec/internal: Fix doxy for ff_alloc_packet2() return valueMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-15avcodec/utils: mark codec argument as const in ff_lock_avcodec()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-14Merge commit '117b432748ca87de4cd0f09d9b1495545e264733'Michael Niedermayer
* commit '117b432748ca87de4cd0f09d9b1495545e264733': lavc: Introduce AVCodec internal capabilities Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-13lavc: Introduce AVCodec internal capabilitiesVittorio Giovara
This field is designed for marking codec properties useful to lavc internals. Two internal capabilities are added: - FF_CODEC_CAP_INIT_THREADSAFE: codec can be opened without locks; - FF_CODEC_CAP_INIT_CLEANUP: codec frees memory if initialization fails.
2014-11-18avcodec/internal: Add () to argument of FF_SIGNBIT() to ensure correct order ↵Michael Niedermayer
or operations Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-18Merge commit '85dc006b1a829726dd5e3a9b0fcc6a1dbfe6dffa'Michael Niedermayer
* commit '85dc006b1a829726dd5e3a9b0fcc6a1dbfe6dffa': lavc: fix bitshifts amount bigger than the type Conflicts: libavcodec/internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-18lavc: fix bitshifts amount bigger than the typeVittorio Giovara
CC: libav-stable@libav.org Bug-Id: CID 1194387 / CID 1194389 / CID 1194393 / CID 1206638
2014-07-23Merge commit 'eba2233b58c2c4b468c58287d6537b2f1188a8cd'Michael Niedermayer
* commit 'eba2233b58c2c4b468c58287d6537b2f1188a8cd': build: Add define for SIMD extensions requiring 16-byte aligned buffers Conflicts: configure libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-21Merge commit '9e500efdbe0deeff1602500ebc229a0a6b6bb1a2'Michael Niedermayer
* commit '9e500efdbe0deeff1602500ebc229a0a6b6bb1a2': Add av_image_check_sar() and use it to validate SAR Conflicts: libavcodec/dpx.c libavcodec/dvdec.c libavcodec/ffv1dec.c libavcodec/utils.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-20Add av_image_check_sar() and use it to validate SARJustin Ruggles
2014-05-20avcodec: remove no longer needed ff_codec_close_recursive()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-20lavc: define STRIDE_ALIGN as 32 when compiling with AVX supportJames Almer
Signed-off-by: James Almer <jamrial@gmail.com> Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-12Merge commit 'dd2d3b766b20196d0b65a82e3d897ccecbf7adb8'Michael Niedermayer
* commit 'dd2d3b766b20196d0b65a82e3d897ccecbf7adb8': lavc: Add hwaccel private data and init/uninit callbacks Conflicts: libavcodec/avcodec.h libavcodec/internal.h libavcodec/pthread_frame.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-12Merge commit '5c1d7246cd65dc4db1b6dc36e29ce39fc1068f3f'Michael Niedermayer
* commit '5c1d7246cd65dc4db1b6dc36e29ce39fc1068f3f': lavc: set AVCodecContext.hwaccel in ff_get_format() Conflicts: libavcodec/mpeg12dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-11Merge commit '632ad2248e2e5d8cd4b51e6c87c943a38c3da425'Michael Niedermayer
* commit '632ad2248e2e5d8cd4b51e6c87c943a38c3da425': lavc: Add an internal wrapper around get_format() Conflicts: libavcodec/h264_slice.c libavcodec/mpeg12dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-11lavc: Add hwaccel private data and init/uninit callbacksAnton Khirnov
2014-05-11lavc: set AVCodecContext.hwaccel in ff_get_format()Anton Khirnov
This way each decoder does not have to do the same thing manually.
2014-05-11lavc: Add an internal wrapper around get_format()Anton Khirnov
It will be useful in the following commits.
2014-03-24Merge commit '4a0f6651434c6f213d830140f575b4ec7858519f'Michael Niedermayer
* commit '4a0f6651434c6f213d830140f575b4ec7858519f': libavcodec: when decoding, copy replaygain side data to decoded frames Conflicts: libavcodec/internal.h libavcodec/rawdec.c libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-24libavcodec: when decoding, copy replaygain side data to decoded framesAnton Khirnov
2014-03-15avcodec: Move STRIDE_ALIGN to internal.hMichael Niedermayer
The next commit/bugfix will need it Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-10Define ff_log2_run[] in libavcodec/internal.h.Carl Eugen Hoyos
This avoids defining the array with different sizes in different source files.
2014-01-06Merge commit '5b4797a21db900b7d509660b7a4d49829089b004'Michael Niedermayer
* commit '5b4797a21db900b7d509660b7a4d49829089b004': avframe: add AV_FRAME_DATA_MATRIXENCODING side data type. Conflicts: libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-05avframe: add AV_FRAME_DATA_MATRIXENCODING side data type.Tim Walker
Includes a libavcodec utility function to update a frame's side data.
2013-12-09Merge commit '37a749012aaacc801fe860428417a6d7b81c103f'Michael Niedermayer
* commit '37a749012aaacc801fe860428417a6d7b81c103f': lavc: rework handling of refcounted_frames=0 Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-09lavc: rework handling of refcounted_frames=0Anton Khirnov
Use only proper AVFrame API (no assigning of whole frames, since that hardcodes sizeof(AVFrame) into lavc). Make a copy of the side data, so the caller can use av_frame_unref/free on non-refcounted frames, eliminating the need for avcodec_get_frame_defaults()/avcodec_free_frame().
2013-11-10Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: hwaccel: Simplify ff_find_hwaccel Conflicts: libavcodec/mpeg12dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-10hwaccel: Simplify ff_find_hwaccelLuca Barbato
It is always called by passing fields from an AVCodecContext.
2013-11-04Merge commit 'da6506c607eda585ba4b15430cf3c9a2ce09c3a9'Michael Niedermayer
* commit 'da6506c607eda585ba4b15430cf3c9a2ce09c3a9': lavc: move AVCodecContext.pkt to AVCodecInternal Conflicts: libavcodec/internal.h libavcodec/rawdec.c libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04Merge commit '38ecc3702dabbea09230f6d6333f59e74f5d1c12'Michael Niedermayer
* commit '38ecc3702dabbea09230f6d6333f59e74f5d1c12': pthread: store thread contexts in AVCodecInternal instead of AVCodecContext Conflicts: libavcodec/internal.h libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04lavc: move AVCodecContext.pkt to AVCodecInternalAnton Khirnov
It's a private field, not meant to be accessed from outside lavc.
2013-11-04pthread: store thread contexts in AVCodecInternal instead of AVCodecContextAnton Khirnov
It's a private field, it should not be visible to callers. Deprecate AVCodecContext.thread_opaque
2013-11-01Merge commit '7644f5a80787c9b608b82873604805d7e38a6a18'Michael Niedermayer
* commit '7644f5a80787c9b608b82873604805d7e38a6a18': lavc: replace avcodec_set_dimensions with ff_set_dimensions Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>