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
2014-06-01Fix nonsense non-mod16 AMV flipping code.Reimar Döffinger
It is obviously nonsense since it produces wrong results or even crashes (crashes should be encode-only though). Fixes trac issue #1092. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-30Merge commit '368f50359eb328b0b9d67451f56fda20b3255f9a'Michael Niedermayer
* commit '368f50359eb328b0b9d67451f56fda20b3255f9a': dsputil: Split off quarterpel bits into their own context Conflicts: configure libavcodec/dsputil.c libavcodec/h263dec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/vc1dec.c libavcodec/vc1dsp.c libavcodec/x86/dsputil_init.c libavcodec/x86/qpeldsp.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-29dsputil: Split off quarterpel bits into their own contextDiego Biurrun
2014-05-01Merge commit 'a2941c8cb216bdc144953cace64973f5600ffa2d'Michael Niedermayer
* commit 'a2941c8cb216bdc144953cace64973f5600ffa2d': lavc: move CODEC_FLAG_MV0 to mpegvideo Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-01Merge commit 'b2c31710c96fa47d9dcd40b64d39663e8957f683'Michael Niedermayer
* commit 'b2c31710c96fa47d9dcd40b64d39663e8957f683': lavc: move CODEC_FLAG_NORMALIZE_AQP to mpegvideo Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-01Merge commit '5fccedaa67390ccddd6347c8e1c71b7664558bcd'Michael Niedermayer
* commit '5fccedaa67390ccddd6347c8e1c71b7664558bcd': lavc: deprecate CODEC_FLAG_INPUT_PRESERVED Conflicts: doc/APIchanges Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-01lavc: move CODEC_FLAG_MV0 to mpegvideoAnton Khirnov
2014-05-01lavc: move CODEC_FLAG_NORMALIZE_AQP to mpegvideoAnton Khirnov
2014-05-01lavc: deprecate CODEC_FLAG_INPUT_PRESERVEDAnton Khirnov
The addition of reference-counted frames makes it pointless.
2014-04-24Use correct msvc type specifiers for ptrdiff_t and size_t.Carl Eugen Hoyos
The Windows runtime aborts if it finds %t or %z. Fixes ticket #3472. Reviewed-by: Ronald Bultje
2014-04-21mpegvideo: Use the current_picture ptsMichael Niedermayer
The picture slot can be recycled by select_input_picture and only current_picture is populated with the valid pts. Unbreak timestamps when in cbr mode. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-04-12avcodec/mpegvideo_enc: override bitrate tolerance when its value is too smallMichael Niedermayer
Fixes Ticket3257 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-10avcodec/mpegvideo_enc: change some asserts to av_assertsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-09Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: mpegvideo: operate with pointers to AVFrames instead of whole structs Conflicts: libavcodec/h261dec.c libavcodec/h263dec.c libavcodec/intrax8.c libavcodec/mpeg12enc.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_motion.c libavcodec/mpegvideo_xvmc.c libavcodec/msmpeg4.c libavcodec/ratecontrol.c libavcodec/vaapi.c libavcodec/vc1dec.c libavcodec/vdpau_vc1.c See: fc567ac49e17151f00f31b59030cd10f952612ef Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-09mpegvideo: operate with pointers to AVFrames instead of whole structswm4
The most interesting parts are initialization in ff_MPV_common_init() and uninitialization in ff_MPV_common_end(). ff_mpeg_unref_picture and ff_thread_release_buffer have additional NULL checks for Picture.f, because these functions can be called on uninitialized or partially initialized Pictures. NULL pointer checks are added to ff_thread_release_buffer() stub function. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-03-21avcodec/mpegvideo: make mc_mb_var_sum / mb_var_sum 64bitMichael Niedermayer
This avoids a hypothetical integer overflow with very high resolution video Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17Merge commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b'Michael Niedermayer
* commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b': mpegvideo: move mpegvideo formats-related defines to mpegutils.h Conflicts: libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_mvpred.h libavcodec/svq1enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17mpegvideo: move mpegvideo formats-related defines to mpegutils.hVittorio Giovara
2014-03-15avcodec/mpegvideo_enc: dont use direct mode for unaligned inputMichael Niedermayer
Fixes Ticket3456 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14Merge commit '05563ccacc98fd185affdbf8cbaf094caf36b852'Michael Niedermayer
* commit '05563ccacc98fd185affdbf8cbaf094caf36b852': dsputil: cosmetics: Lose camelCase on ff_cropTbl and ff_squareTbl names Conflicts: libavcodec/bit_depth_template.c libavcodec/motionpixels_tablegen.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-13dsputil: cosmetics: Lose camelCase on ff_cropTbl and ff_squareTbl namesDiego Biurrun
Also switch from "tbl" to "tab" name suffixes.
2014-03-13dsputil: Drop ff_check_alignment() functionDiego Biurrun
The function is supposed to confirm that the compiler provided enough alignment, but in practice it is only run in certain code paths and insufficient alignment problems are restricted to legacy compilers.
2014-02-18avcodec: support setting the chroma intra matrixMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-08lavc/mpegvideo: add missing constLukasz Marek
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-26Merge commit 'fb0c9d41d685abb58575c5482ca33b8cd457c5ec'Michael Niedermayer
* commit 'fb0c9d41d685abb58575c5482ca33b8cd457c5ec': avutil: remove timer.h include from internal.h Conflicts: libavcodec/ffv1dec.c libavutil/internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-26avutil: remove timer.h include from internal.hJanne Grunau
Added libavutil/timer.h include to all files with {START,STOP}_TIMER.
2014-01-23Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: mpegvideo_enc: Don't call ff_h263dsp_init unconditionally Conflicts: libavcodec/mpegvideo_enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-22mpegvideo_enc: Don't call ff_h263dsp_init unconditionallyMartin Storsjö
This fixes builds with e.g. --disable-decoders --disable-encoders --enable-encoder=mjpeg. Signed-off-by: Martin Storsjö <martin@martin.st>
2014-01-20avcodec/mpegvideo_enc: disable direct mode in load_input_picture() for ↵Michael Niedermayer
dimensions%16 != 0 We currently read a whole 16x16 block from the input at a few places Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-18avcodec/mpegvideo_enc: fix custom matrixes with jpegMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-17avcodec: make "bitrate tolerance too small for bitrate" error more verboseMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-12avcodec/mpegvideo_enc: init chroma matrix for mjpegMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-12avcodec/mjpegenc: pass chroma quantization matrix through as well, not just lumaMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-09Merge commit 'ebfe622bb1ca57cecb932e42926745cba7161913'Michael Niedermayer
* commit 'ebfe622bb1ca57cecb932e42926745cba7161913': mpegvideo: drop support for real (non-emulated) edges Conflicts: libavcodec/mpegvideo.c libavcodec/mpegvideo_motion.c libavcodec/wmv2.c If this is slower on a major platform then it should be investigated and potentially reverted. See: 8fc52a5ef94712d900fc8fe7503cf9c9ba635143 See: 3969b4b861ce8152e3195e8f8c3437abd273b90a Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-09mpegvideo: drop support for real (non-emulated) edgesAnton Khirnov
Several decoders disable those anyway and they are not measurably faster on x86. They might be somewhat faster on other platforms due to missing emu edge SIMD, but the gain is not large enough (and those decoders relevant enough) to justify the added complexity.
2014-01-04Merge commit 'aec25b1c4650944d32706bfd40eb02bbd5587303'Michael Niedermayer
* commit 'aec25b1c4650944d32706bfd40eb02bbd5587303': mpegvideo: split the encoding-only parts of frame_start() into a separate function Conflicts: libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-03mpegvideo: split the encoding-only parts of frame_start() into a separate ↵Anton Khirnov
function This introduces some code duplication. However, much of it should go away once the decoders stop using MpegEncContext.
2014-01-01avcodec/mpegvideo_enc: implement frame skip score normalizationMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-20avcodec/mpegvideo_enc: fix frame skipping with intra only codecsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-20avcodec/mpegvideo_enc: fix integer overflow with -skip_exp >= 2Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06avcodec/mpegvideo_enc/frame_end(): remove unused variableMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06Merge commit '24abd806ea0cfb0d988d2f0044eac79cff12918c'Michael Niedermayer
* commit '24abd806ea0cfb0d988d2f0044eac79cff12918c': ljpegenc: deMpegEncContextize Conflicts: libavcodec/ljpegenc.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c tests/ref/vsynth/vsynth1-ljpeg tests/ref/vsynth/vsynth2-ljpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06Merge commit '3360ad995530ea6967b1e83981b4aa8240fbb0ed'Michael Niedermayer
* commit '3360ad995530ea6967b1e83981b4aa8240fbb0ed': mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_picture_trailer() Conflicts: libavcodec/ljpegenc.c libavcodec/mjpegenc.c libavcodec/mjpegenc.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06Merge commit '058d5f2feb730846f22c1812e433f92f670ad751'Michael Niedermayer
* commit '058d5f2feb730846f22c1812e433f92f670ad751': mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_picture_header() Conflicts: libavcodec/mjpegenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06Merge commit '0b0a7a751de02464a33717e70352f696372ba1c4'Michael Niedermayer
* commit '0b0a7a751de02464a33717e70352f696372ba1c4': mpegvideo: move encode-only parts of common_end() to encode_end() Conflicts: libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06avcodec/mpegvideo_enc: fix linesizes in frame_end()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06Merge commit '381a722562bcc0b623acf6a00a583fe989bcb72a'Michael Niedermayer
* commit '381a722562bcc0b623acf6a00a583fe989bcb72a': mpegvideo: split the encoding-only parts of ff_MPV_frame_end() into a separate function Conflicts: libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06Merge commit '1f8eb69079880ef1f394c498dfdf471f91222a06'Michael Niedermayer
* commit '1f8eb69079880ef1f394c498dfdf471f91222a06': mpegvideo: move encoding-only initialization from common_init() to encode_init() Conflicts: libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06Merge commit 'bedf952bb80ae26427854dcde56c139ecb87d4a0'Michael Niedermayer
* commit 'bedf952bb80ae26427854dcde56c139ecb87d4a0': mpegvideo: move setting encoding-only vars from common_defaults() to encode_defaults() Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-05ljpegenc: deMpegEncContextizeAnton Khirnov
The encoder uses almost none of the mpegvideo infrastructure, only some fields from MpegEncContext. The FATE results change because now an all-zero quant matrix is written into the file. Since it is not used for anything for ljpeg, this should not be a problem.