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-12-19Merge commit '5d839778b9f3edb682b7f71dde4f80f07c75b098'Michael Niedermayer
* commit '5d839778b9f3edb682b7f71dde4f80f07c75b098': lavu: Refactor side data wiping Conflicts: libavutil/frame.c See: a400edbb6d00c0211de38e4f1b4f593681db91d8 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-19lavu: Refactor side data wipingLuca Barbato
And make sure the nb_side_data field is reset as well. Based on an initial patch from wm4 <nfxjfg@googlemail.com>. CC: libav-stable@libav.org
2014-12-15lavu/frame: fix malloc error path in av_frame_copy_props()wm4
The error path frees all side data, but forgets to reset the side data count. This can blow up later in av_frame_unref() and free_side_data(). Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-29Add missing "const" all over the place.Reimar Döffinger
Only "./configure --enable-gpl" on x86 was tested. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-08-18avcodec: export motion vectors in frame side data on demandClément Bœsch
The reasoning behind this addition is that various third party applications are interested in getting some motion information out of a video "for free" when it is available. It was considered to export other information as well (such as the intra information about the block, or the quantization) but the structure might have ended up into a half full-generic, half full of codec specific cruft. If more information is necessary, it should either be added in the "flags" field of the AVMotionVector structure, or in another side-data. This commit also includes an example exporting them in a CSV stream.
2014-08-14frame: Remove some FF_API_AVFRAME_COLORSPACE leftoversDiego Biurrun
2014-08-11Remove panscan information in av_frame_copy_props() if resolution changes.Carl Eugen Hoyos
Fixes ticket #3750.
2014-08-10Merge commit '472f9ed312ec784f7c72876b77163f4741880d05'Michael Niedermayer
* commit '472f9ed312ec784f7c72876b77163f4741880d05': Remove obsolete FF_API_AVFRAME_COLORSPACE cruft. Conflicts: libavcodec/utils.c libavutil/frame.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-09Remove obsolete FF_API_AVFRAME_COLORSPACE cruft.Anton Khirnov
2014-07-30avutil/frame: add av_frame_side_data_name()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-18Merge commit '44671b57866aab8dd36715ff010e985e25baaf19'Michael Niedermayer
* commit '44671b57866aab8dd36715ff010e985e25baaf19': AVFrame: factor out freeing the side data Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-18AVFrame: factor out freeing the side dataRoman Savchenko
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-06-01Merge commit '8c02adc62d71dfbb079a04753d8c16152c49de88'Michael Niedermayer
* commit '8c02adc62d71dfbb079a04753d8c16152c49de88': lavu: add all color-related enums to AVFrame Conflicts: libavcodec/avcodec.h libavutil/frame.c libavutil/frame.h libavutil/version.h The version check is changed so they are available with the current ABI FFmpeg libs should have no problems with added fields, nor should any application using the libs, and we regularly added fields in the past. We also moved 2 of these fields to AVFrame already previously without issues. See: a80e622924c89df69fb1c225ba432fe12fe6648e Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01lavu: add all color-related enums to AVFramewm4
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-05-31avutil/frame: frame_copy_video: support copying from a smaller to a larger frameMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-29Merge commit 'a53551cba86bb67efcb6105fdc337a36c43132bd'Michael Niedermayer
* commit 'a53551cba86bb67efcb6105fdc337a36c43132bd': frame: fix the error path in av_frame_copy_props() Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-29frame: fix the error path in av_frame_copy_props()Roman Savchenko
First free metadata, then the side data it is contained in. Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-04-15avutil/frame: use av_malloc(z)_array()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-24Merge commit 'd161ae0a37900cbd36c1390ca32a56b892c02ab5'Michael Niedermayer
* commit 'd161ae0a37900cbd36c1390ca32a56b892c02ab5': frame: add a function for removing side data from a frame Conflicts: libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-24frame: add a function for removing side data from a frameAnton Khirnov
2014-02-24avutil/frame_copy_audio: also check that channels matchMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-24Merge commit '1155fd02ae7bac215acab316e847c6bb25f74fc3'Michael Niedermayer
* commit '1155fd02ae7bac215acab316e847c6bb25f74fc3': frame: add a convenience function for copying AVFrame data Conflicts: doc/APIchanges libavutil/frame.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-24frame: add a convenience function for copying AVFrame dataAnton Khirnov
2013-12-28avutil/frame: increase padding for framesMichael Niedermayer
This matches what avcodec uses Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-09Merge commit 'df7aba52b51007db50410abe15fe28391abd8757'Michael Niedermayer
* commit 'df7aba52b51007db50410abe15fe28391abd8757': frame: cosmetics, reindent Conflicts: libavutil/frame.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-09Merge commit 'c342132fa8a29692e28c98238e3a31da5c407e42'Michael Niedermayer
* commit 'c342132fa8a29692e28c98238e3a31da5c407e42': frame: copy flags in av_frame_copy_props() Conflicts: libavutil/frame.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-09frame: cosmetics, reindentAnton Khirnov
2013-12-09frame: copy flags in av_frame_copy_props()Anton Khirnov
Flags can be considered metadata (at least those that are defined now).
2013-11-27get_audio_buffer: fix usage where channels are not set but layout isMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-28Merge commit '529a9893d769f381b72785c500662be2020da5fe'Michael Niedermayer
* commit '529a9893d769f381b72785c500662be2020da5fe': avframe: mark source frame const in _ref and _clone Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-28avframe: mark source frame const in _ref and _cloneVittorio Giovara
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-09-20avutil/frame: suppress "comparison of unsigned expression < 0 is always ↵Michael Niedermayer
false" warning Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-20avutil: add av_get_colorspace_name()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-10Integrate accessors.h header into internal.hReimar Döffinger
I have no idea why I added a separate header, I think there is no good reason for it. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-08-08Reduce MAKE_ACCESSORS code duplication via a new header.Reimar Döffinger
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-08-07av_frame_copy_props: fix unintended self assignmentMichael Niedermayer
Fixes CID1061052 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-01Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: avframe: have av_frame_get_side_data take const AVFrame* Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-01avframe: have av_frame_get_side_data take const AVFrame*Vittorio Giovara
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-07-17avcodec/avutil: Add AVColorSpace and AVColorRange to AVFramesMichael Niedermayer
This also moves AVColorSpace and AVColorRange from avcodec to avutil Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-13av_frame_get_buffer: Do not fail when the channel layout is unknownMichael Niedermayer
Fixes handling of cases with unknown layouts but known channel counts Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-18avutil/frame: Try to align width to achive linesize[0] alignmentMichael Niedermayer
This results in more alignment for pixel formats that have "odd" pixel sizes like RGB24. It makes access through SIMD easier Works around Issue described in Ticket1031 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21avutil/frame: continue to process bufs even if some are emptyXidorn Quan
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-15Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_* Conflicts: doc/APIchanges libavcodec/avpicture.c libavcodec/ffv1dec.c libavcodec/ffv1enc.c libavcodec/imgconvert.c libavcodec/tiffenc.c libavfilter/vf_pixdesctest.c libavfilter/vf_scale.c libavutil/imgutils.c libavutil/pixdesc.c libavutil/version.h libswscale/swscale_internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-15pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_*Anton Khirnov
2013-05-09lavu: add FF_CEIL_RSHIFT and use it in various places.Clément Bœsch
2013-03-23Merge commit '1e8b9738fa70e20967ddb542d2f9d5552fc51ec6'Michael Niedermayer
* commit '1e8b9738fa70e20967ddb542d2f9d5552fc51ec6': avutil/frame: add all remaining frame properties to av_frame_copy_props Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-22avutil/frame: add all remaining frame properties to av_frame_copy_propsHendrik Leppkes
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-03-20lavu/frame: use channels rather than channel_layout.Nicolas George
2013-03-17avutil/frame: fix video buffer allocationMichael Niedermayer
The padding was lost during porting from avcodec Should fix out of array accesses Found-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-15avutil/frame: add AVBufferRef for qp tableMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>