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
2015-07-27Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'Michael Niedermayer
* commit 'def97856de6021965db86c25a732d78689bd6bb0': lavc: AV-prefix all codec capabilities Conflicts: cmdutils.c ffmpeg.c ffplay.c libavcodec/8svx.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/adpcm.c libavcodec/alac.c libavcodec/atrac3plusdec.c libavcodec/bink.c libavcodec/dnxhddec.c libavcodec/dvdec.c libavcodec/dvenc.c libavcodec/ffv1dec.c libavcodec/ffv1enc.c libavcodec/fic.c libavcodec/flacdec.c libavcodec/flacenc.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/hevc.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopenjpegdec.c libavcodec/libvo-aacenc.c libavcodec/libvorbisenc.c libavcodec/libvpxdec.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpegaudiodec_float.c libavcodec/msmpeg4dec.c libavcodec/mxpegdec.c libavcodec/nvenc_h264.c libavcodec/nvenc_hevc.c libavcodec/pngdec.c libavcodec/qpeg.c libavcodec/ra288.c libavcodec/rv10.c libavcodec/s302m.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tiff.c libavcodec/tta.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/vp9.c libavcodec/wavpack.c libavcodec/yop.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27lavc: AV-prefix all codec capabilitiesVittorio Giovara
Express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
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-03-30Merge commit '23944d29a22a2cd602753b3705f73011c3bf0b18'Michael Niedermayer
* commit '23944d29a22a2cd602753b3705f73011c3bf0b18': indeo: Give Indeo4/5 shared code a more consistent name Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-30indeo: Give Indeo4/5 shared code a more consistent nameDiego Biurrun
2014-06-27Merge commit '5ec6d152e26c570c0a16ec72c1f354db95708179'Michael Niedermayer
* commit '5ec6d152e26c570c0a16ec72c1f354db95708179': indeo4: B-frames decoding Conflicts: libavcodec/ivi_common.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-26indeo4: B-frames decodingDirk Ausserhaus
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
2014-06-23Merge commit 'e121ac634ba324a318f4a97f978dcfb48da6b735'Michael Niedermayer
* commit 'e121ac634ba324a318f4a97f978dcfb48da6b735': indeo45: use is_indeo4 context flag instead of checking codec ID Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-23indeo45: use is_indeo4 context flag instead of checking codec IDDirk Ausserhaus
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
2014-06-01Decode both parts of Indeo4 IP framesDirk Ausserhaus
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
2014-06-01Move Indeo4 frametypes into common header.Dirk Ausserhaus
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
2014-05-30avcodec/indeo4: Decode both parts of IP framesDirk Ausserhaus
Fixes part of Ticket845 av_frame_move_ref() idea by Anton Khirnov Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-30avcodec/indeo4: Move frametypes into common header.Dirk Ausserhaus
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-25Revert "Merge remote-tracking branch 'qatar/master'" ↵Michael Niedermayer
(43dec5ef9a360c9ffac3278f464832bd99af0cb0) Fixes out of array accesses Fixes asan_static-oob_eb9812_5961_iv41.avi This reverts the merge of c9ef6b09326a24010bf86d6b0d19cfa42df4d546 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
2013-10-13Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: indeo4: Check the inherited quant_mat Conflicts: libavcodec/indeo4.c See: 884efd4e09696b201457feebdef684aee30be99d Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-13Merge commit '0cb83c563848bf8f8365e7bd30e7e6b57ef360f0'Michael Niedermayer
* commit '0cb83c563848bf8f8365e7bd30e7e6b57ef360f0': indeo4: Check the block size if reusing the band configuration Conflicts: libavcodec/indeo4.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-13indeo4: Check the inherited quant_matLuca Barbato
Invalidate it if not supported. Sample-Id: 00000262-google Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
2013-10-13indeo4: Check the block size if reusing the band configurationLuca Barbato
Sample-Id: 00000287-google Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
2013-10-04Merge commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2'Michael Niedermayer
* commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2': cosmetics: Group .name and .long_name together in codec/format declarations Conflicts: libavcodec/8svx.c libavcodec/alac.c libavcodec/cljr.c libavcodec/dnxhddec.c libavcodec/dnxhdenc.c libavcodec/dpxenc.c libavcodec/dvdec.c libavcodec/dvdsubdec.c libavcodec/dvdsubenc.c libavcodec/ffv1dec.c libavcodec/flacdec.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/g726.c libavcodec/gif.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/h263dec.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopencore-amr.c libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libspeexenc.c libavcodec/libvo-amrwbenc.c libavcodec/libvorbisenc.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/libxavs.c libavcodec/libxvid.c libavcodec/ljpegenc.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpeg12dec.c libavcodec/mpeg4videodec.c libavcodec/msmpeg4dec.c libavcodec/pgssubdec.c libavcodec/pngdec.c libavcodec/pngenc.c libavcodec/proresdec_lgpl.c libavcodec/proresenc_kostya.c libavcodec/ra144enc.c libavcodec/rawdec.c libavcodec/rv10.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tta.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/wavpack.c libavcodec/xbmenc.c libavcodec/yop.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-04cosmetics: Group .name and .long_name together in codec/format declarationsDiego Biurrun
2013-08-30Reinstate proper FFmpeg license for all files.Thilo Borgmann
2013-07-15Merge commit '28dda8a691f1c723a4a9365ab85f9625f1330096'Michael Niedermayer
* commit '28dda8a691f1c723a4a9365ab85f9625f1330096': indeo: Sanitize ff_ivi_init_planes fail paths Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-15indeo: Sanitize ff_ivi_init_planes fail pathsLuca Barbato
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
2013-07-14indeo4: print an error message if ref_mb is needed but unavailableMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-14indeo: print errors if transform and block size mismatchMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-14Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: indeo: Bound-check before applying transform Conflicts: libavcodec/indeo4.c libavcodec/indeo5.c libavcodec/ivi_common.c See: af388237093ed6df6f5118b34ef938a2ca2ffbda, 0846719dd11ab3f7a7caee13e7af71f71d913389 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-14Merge commit 'cd78e934c246d1b2510f8fba0abfe40bb75795f6'Michael Niedermayer
* commit 'cd78e934c246d1b2510f8fba0abfe40bb75795f6': indeo4: Validate scantable dimension See: 92f7f1db421ee8b3431534fa09e8050ba622c33a Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-14Merge commit '6255ccf7d51c82ab79bf0cd47a921f572dda4489'Michael Niedermayer
* commit '6255ccf7d51c82ab79bf0cd47a921f572dda4489': indeo4: Check the quantization matrix index Conflicts: libavcodec/indeo4.c See: 8a20774a24bb1ea68b7360113746eac6e59ad8a8 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-14Merge commit '8435bca087c0e79385763c51de009fd89390b6a5'Michael Niedermayer
* commit '8435bca087c0e79385763c51de009fd89390b6a5': indeo4: Do not access missing reference MV Conflicts: libavcodec/indeo4.c See: 5216245a, aae44fb4 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-13indeo: Bound-check before applying transformLuca Barbato
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
2013-07-13indeo4: Validate scantable dimensionLuca Barbato
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
2013-07-13indeo4: Check the quantization matrix indexLuca Barbato
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
2013-07-13indeo4: Do not access missing reference MVLuca Barbato
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
2013-05-29Merge commit '4a27a52a1f74016095b7aee1b4a422cf62217ade'Michael Niedermayer
* commit '4a27a52a1f74016095b7aee1b4a422cf62217ade': fate: Don't use files from SRC_PATH in the actual tests indeo4: reuse context block VLC for band instead of defaulting Conflicts: tests/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-29Merge commit '6647aa0426e73839b9b1d1c9d86188f469167531'Michael Niedermayer
* commit '6647aa0426e73839b9b1d1c9d86188f469167531': indeo4: add missing Haar and slanted transforms dxtory v2 support Conflicts: libavcodec/indeo4.c libavcodec/ivi_dsp.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-28indeo4: reuse context block VLC for band instead of defaultingKostya Shishkov
Currently if no custom block VLC is specified for band, a default block VLC will be used, while the global block VLC stored in the context should be used instead. This fixes decoding of one sample I have.
2013-05-28indeo4: add missing Haar and slanted transformsKostya Shishkov
That involves fixing INV_HAAR4() macro and changing it to work with different input and output like INV_HAAR8() instead of in-place transform.
2013-04-22indeo4: implement haar 8x1 and 1x8 transformsMichael Niedermayer
Fixes Ticket1984 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-14Merge commit '6d97484d72e33f7dde9493a9ead1a72e2f029605'Michael Niedermayer
* commit '6d97484d72e33f7dde9493a9ead1a72e2f029605': avcodec: av_log_ask_for_sample() ---> avpriv_request_sample() rsodec: Use avpriv_report_missing_feature() where appropriate Conflicts: libavcodec/anm.c libavcodec/mlpdec.c libavcodec/pictordec.c libavcodec/sunrast.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-14avcodec: av_log_ask_for_sample() ---> avpriv_request_sample()Diego Biurrun
2013-02-26Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'Michael Niedermayer
* commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f': Remove unnecessary dsputil.h #includes Conflicts: libavcodec/ffv1.c libavcodec/h261dec.c libavcodec/h261enc.c libavcodec/h264pred.c libavcodec/lpc.h libavcodec/mjpegdec.c libavcodec/rectangle.h libavcodec/x86/idct_sse2_xvid.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-26Remove unnecessary dsputil.h #includesDiego Biurrun
2013-01-26indeo4: check for invalid transform_size blk_size combinationsMichael Niedermayer
The checks existing previously where not sufficient Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-13indeo4: more complete check for the scan vs block sizes.Michael Niedermayer
Fixes out of array reads Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-29Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: lavc: add CODEC_CAP_DR1 to all video decoders missing them rtpdec: Cosmetic cleanup Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-29lavc: add CODEC_CAP_DR1 to all video decoders missing themAnton Khirnov
2012-10-18indeo4: prevent printing uninitialized variableMichael Niedermayer
Fixes CID703822 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-08Merge commit '716d413c13981da15323c7a3821860536eefdbbb'Michael Niedermayer
* commit '716d413c13981da15323c7a3821860536eefdbbb': Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat Conflicts: doc/examples/muxing.c ffmpeg.h ffmpeg_filter.c ffmpeg_opt.c ffplay.c ffprobe.c libavcodec/8bps.c libavcodec/aasc.c libavcodec/aura.c libavcodec/avcodec.h libavcodec/avs.c libavcodec/bfi.c libavcodec/bmp.c libavcodec/bmpenc.c libavcodec/c93.c libavcodec/cscd.c libavcodec/cyuv.c libavcodec/dpx.c libavcodec/dpxenc.c libavcodec/eatgv.c libavcodec/escape124.c libavcodec/ffv1.c libavcodec/flashsv.c libavcodec/fraps.c libavcodec/h264.c libavcodec/huffyuv.c libavcodec/iff.c libavcodec/imgconvert.c libavcodec/indeo3.c libavcodec/kmvc.c libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libx264.c libavcodec/ljpegenc.c libavcodec/mjpegdec.c libavcodec/mjpegenc.c libavcodec/motionpixels.c libavcodec/mpeg12.c libavcodec/mpeg12enc.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo_enc.c libavcodec/pamenc.c libavcodec/pcxenc.c libavcodec/pgssubdec.c libavcodec/pngdec.c libavcodec/pngenc.c libavcodec/pnm.c libavcodec/pnmdec.c libavcodec/pnmenc.c libavcodec/ptx.c libavcodec/qdrw.c libavcodec/qpeg.c libavcodec/qtrleenc.c libavcodec/raw.c libavcodec/rawdec.c libavcodec/rl2.c libavcodec/sgidec.c libavcodec/sgienc.c libavcodec/snowdec.c libavcodec/snowenc.c libavcodec/sunrast.c libavcodec/targa.c libavcodec/targaenc.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/tmv.c libavcodec/truemotion2.c libavcodec/utils.c libavcodec/vb.c libavcodec/vp3.c libavcodec/wnv1.c libavcodec/xl.c libavcodec/xwddec.c libavcodec/xwdenc.c libavcodec/yop.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersrc.c libavfilter/drawutils.c libavfilter/formats.c libavfilter/src_movie.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_format.c libavfilter/vf_hflip.c libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_transpose.c libavfilter/vf_yadif.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/movenc.c libavformat/mxf.h libavformat/utils.c libavformat/yuv4mpeg.c libavutil/imgutils.c libavutil/pixdesc.c libswscale/input.c libswscale/output.c libswscale/swscale_internal.h libswscale/swscale_unscaled.c libswscale/utils.c libswscale/x86/swscale_template.c libswscale/x86/yuv2rgb.c libswscale/x86/yuv2rgb_template.c libswscale/yuv2rgb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-08Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormatAnton Khirnov