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-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-30Merge commit '3832a6590156e6abc575bed51cbffa78617ee5fd'Michael Niedermayer
* commit '3832a6590156e6abc575bed51cbffa78617ee5fd': dsputil: Move ff_alternate_*_scan tables to mpegvideo Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-29dsputil: Split off quarterpel bits into their own contextDiego Biurrun
2014-05-29dsputil: Move ff_alternate_*_scan tables to mpegvideoDiego 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-01lavc: move CODEC_FLAG_MV0 to mpegvideoAnton Khirnov
2014-05-01lavc: move CODEC_FLAG_NORMALIZE_AQP to mpegvideoAnton Khirnov
2014-04-30Merge commit 'c1f92d13589d431e576d719dd44427486a5e05cd'Michael Niedermayer
* commit 'c1f92d13589d431e576d719dd44427486a5e05cd': mpegvideo: remove unused MpegEncContext.b4_stride Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-30Merge commit '6a13505c069890cb0e2a07e29fd819a0cf2e73c1'Michael Niedermayer
* commit '6a13505c069890cb0e2a07e29fd819a0cf2e73c1': mpegvideo: move the MpegEncContext fields used from arm asm to the beginning Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-29mpegvideo: remove unused MpegEncContext.b4_strideAnton Khirnov
2014-04-29mpegvideo: move the MpegEncContext fields used from arm asm to the beginningAnton Khirnov
This should reduce the frequency with which the offsets need to be updated.
2014-04-09avcodec/mpegvideo: remove AVFrame padding, as the hack isnt needed anymoreMichael 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-28avcodec: Make ff_print_debug_info2() independant of Picture structMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-23Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: lavc: drop ff_pixfmt_list_420 Conflicts: libavcodec/flvdec.c libavcodec/msmpeg4dec.c libavcodec/rv10.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-23lavc: drop ff_pixfmt_list_420Vittorio Giovara
2014-03-23avcodec: Add padding after the remaining AVFramesMichael Niedermayer
This limits ABI issues in case libavcodec is linked to a libavutil with larger AVFrame Which can happen if they are shiped in seperate binary packages and libavutil is upgraded A cleaner alternative would be to replace them by pointers but this would likely cause a small speedloss Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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-21avcodec/mpegvideo: make mc_mb_var_sum_temp / mb_var_sum_temp 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 '7245a0ae872d4f65396a37d13f5d1d2c2efe11c2'Michael Niedermayer
* commit '7245a0ae872d4f65396a37d13f5d1d2c2efe11c2': mpegvideo: remove h264-only fields Conflicts: libavcodec/mpegvideo.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17Merge commit 'be039278b5ebd8075d90a3508db2aed5adf59e02'Michael Niedermayer
* commit 'be039278b5ebd8075d90a3508db2aed5adf59e02': mpegvideo: move ff_draw_horiz_band() to mpegutils.c Conflicts: libavcodec/Makefile Merged-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-17Merge commit '9b749c8274f6b6f35dde2cf29b99fa4f719abf87'Michael Niedermayer
* commit '9b749c8274f6b6f35dde2cf29b99fa4f719abf87': h264: move relevant fields from Picture to H264Picture Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17Merge commit 'd66e305bd1b4f3e91ae4e7e549148509d0811672'Michael Niedermayer
* commit 'd66e305bd1b4f3e91ae4e7e549148509d0811672': er: move relevant fields from Picture to ERPicture Conflicts: libavcodec/error_resilience.c libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17Merge commit '75af13a'Michael Niedermayer
* commit '75af13a': mpegvideo: directly use frames in ff_draw_horiz_band() Conflicts: libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17mpegvideo: remove h264-only fieldsVittorio Giovara
2014-03-17mpegvideo: move ff_draw_horiz_band() to mpegutils.cVittorio Giovara
Drop the mpegvideo dependency for svq3 in configure.
2014-03-17mpegvideo: move mpegvideo formats-related defines to mpegutils.hVittorio Giovara
2014-03-17er: move relevant fields from Picture to ERPictureVittorio Giovara
This is done to disentangle ER from mpegvideo. In order to use a classic Picture, callers can use ff_mpeg_set_erpic() or use a custom function to set the fields. Please note that buffers need to be allocated before calling ff_er_frame_end().
2014-03-17mpegvideo: directly use frames in ff_draw_horiz_band()Vittorio Giovara
2014-02-27avcodec/h264: avoid using lost frames as referencesMichael Niedermayer
Fixes Ticket3386 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-29Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: mpeg: Drop unused parameters from ff_draw_horiz_band() Conflicts: libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-29mpeg: Drop unused parameters from ff_draw_horiz_band()Diego Biurrun
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 remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: mpegvideo: remove disabled bfin asm Conflicts: libavcodec/bfin/mpegvideo_bfin.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-03mpegvideo: remove disabled bfin asmAnton Khirnov
It has been disabled as 'broken' over 3 years ago in b716a792
2013-12-23Convert XvMC to hwaccel v3Ivan Kalvachev
Signed-off-by: Ivan Kalvachev <ikalvachev@gmail.com> 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 '282c6a1a0ef3e8c8e180c15b39cfe5b89704d848'Michael Niedermayer
* commit '282c6a1a0ef3e8c8e180c15b39cfe5b89704d848': mpegvideo: make ff_release_unused_pictures() static Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06Merge commit 'c99307caee01441cfde24f3b7b0db3037b7022dc'Michael Niedermayer
* commit 'c99307caee01441cfde24f3b7b0db3037b7022dc': mpegvideo: make frame_size_alloc() static. 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-06Merge commit 'ff7ffe48097f32417781fe8b2b417eff05a52c55'Michael Niedermayer
* commit 'ff7ffe48097f32417781fe8b2b417eff05a52c55': mpeg4videodec: move showed_packed_warning from MpegEncContext to Mpeg4DecContext Conflicts: libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06Merge commit 'f7d228676cb7669059889c4225c8a8dc56708c24'Michael Niedermayer
* commit 'f7d228676cb7669059889c4225c8a8dc56708c24': mpeg4videodec: move intra_dc_threshold from MpegEncContext to Mpeg4DecContext Conflicts: libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06Merge commit 'a097f0049b28dc3ed13625e4a42619292c92492f'Michael Niedermayer
* commit 'a097f0049b28dc3ed13625e4a42619292c92492f': mpeg12dec: move first_slice from MpegEncContext to Mpeg1Context Conflicts: libavcodec/mpeg12dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06Merge commit 'ff300e435e5337b03dc7a8f1c0be6c9937059c1e'Michael Niedermayer
* commit 'ff300e435e5337b03dc7a8f1c0be6c9937059c1e': mpegvideo: remove an unused variable Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06Merge commit 'e41ff4210ac1192c62de3052b33a38c7bcf772f2'Michael Niedermayer
* commit 'e41ff4210ac1192c62de3052b33a38c7bcf772f2': mpeg4videodec: move use_intra_dc_vlc from MpegEncContext to Mpeg4DecContext Conflicts: libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>