aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/frame.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '44671b57866aab8dd36715ff010e985e25baaf19'Michael Niedermayer2014-06-181-9/+12
|\ | | | | | | | | | | | | * commit '44671b57866aab8dd36715ff010e985e25baaf19': AVFrame: factor out freeing the side data Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * AVFrame: factor out freeing the side dataRoman Savchenko2014-06-181-9/+12
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '8c02adc62d71dfbb079a04753d8c16152c49de88'Michael Niedermayer2014-06-011-1/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * lavu: add all color-related enums to AVFramewm42014-06-011-0/+14
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avutil/frame: frame_copy_video: support copying from a smaller to a larger frameMichael Niedermayer2014-05-311-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'a53551cba86bb67efcb6105fdc337a36c43132bd'Michael Niedermayer2014-05-291-1/+1
|\| | | | | | | | | | | | | * commit 'a53551cba86bb67efcb6105fdc337a36c43132bd': frame: fix the error path in av_frame_copy_props() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * frame: fix the error path in av_frame_copy_props()Roman Savchenko2014-05-291-1/+1
| | | | | | | | | | | | First free metadata, then the side data it is contained in. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avutil/frame: use av_malloc(z)_array()Michael Niedermayer2014-04-151-4/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd161ae0a37900cbd36c1390ca32a56b892c02ab5'Michael Niedermayer2014-03-241-0/+16
|\| | | | | | | | | | | | | | | | | | | * commit 'd161ae0a37900cbd36c1390ca32a56b892c02ab5': frame: add a function for removing side data from a frame Conflicts: libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * frame: add a function for removing side data from a frameAnton Khirnov2014-03-241-0/+16
| |
* | avutil/frame_copy_audio: also check that channels matchMichael Niedermayer2014-02-241-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1155fd02ae7bac215acab316e847c6bb25f74fc3'Michael Niedermayer2014-02-241-18/+67
|\| | | | | | | | | | | | | | | | | | | | | | | * 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>
| * frame: add a convenience function for copying AVFrame dataAnton Khirnov2014-02-241-16/+65
| |
* | avutil/frame: increase padding for framesMichael Niedermayer2013-12-281-1/+1
| | | | | | | | | | | | This matches what avcodec uses Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'df7aba52b51007db50410abe15fe28391abd8757'Michael Niedermayer2013-12-091-23/+23
|\| | | | | | | | | | | | | | | | | | | * commit 'df7aba52b51007db50410abe15fe28391abd8757': frame: cosmetics, reindent Conflicts: libavutil/frame.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * frame: cosmetics, reindentAnton Khirnov2013-12-091-15/+15
| |
* | Merge commit 'c342132fa8a29692e28c98238e3a31da5c407e42'Michael Niedermayer2013-12-091-0/+1
|\| | | | | | | | | | | | | | | | | | | * commit 'c342132fa8a29692e28c98238e3a31da5c407e42': frame: copy flags in av_frame_copy_props() Conflicts: libavutil/frame.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * frame: copy flags in av_frame_copy_props()Anton Khirnov2013-12-091-0/+1
| | | | | | | | Flags can be considered metadata (at least those that are defined now).
* | get_audio_buffer: fix usage where channels are not set but layout isMichael Niedermayer2013-11-271-2/+8
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '529a9893d769f381b72785c500662be2020da5fe'Michael Niedermayer2013-10-281-2/+2
|\| | | | | | | | | | | | | * commit '529a9893d769f381b72785c500662be2020da5fe': avframe: mark source frame const in _ref and _clone Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avframe: mark source frame const in _ref and _cloneVittorio Giovara2013-10-271-2/+2
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avutil/frame: suppress "comparison of unsigned expression < 0 is always ↵Michael Niedermayer2013-09-191-1/+1
| | | | | | | | | | | | false" warning Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil: add av_get_colorspace_name()Michael Niedermayer2013-09-191-0/+16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Integrate accessors.h header into internal.hReimar Döffinger2013-08-101-2/+0
| | | | | | | | | | | | | | 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>
* | Reduce MAKE_ACCESSORS code duplication via a new header.Reimar Döffinger2013-08-081-3/+1
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | av_frame_copy_props: fix unintended self assignmentMichael Niedermayer2013-08-071-1/+1
| | | | | | | | | | | | Fixes CID1061052 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-08-011-1/+1
|\| | | | | | | | | | | | | * qatar/master: avframe: have av_frame_get_side_data take const AVFrame* Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avframe: have av_frame_get_side_data take const AVFrame*Vittorio Giovara2013-08-011-1/+1
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avcodec/avutil: Add AVColorSpace and AVColorRange to AVFramesMichael Niedermayer2013-07-171-0/+5
| | | | | | | | | | | | This also moves AVColorSpace and AVColorRange from avcodec to avutil Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | av_frame_get_buffer: Do not fail when the channel layout is unknownMichael Niedermayer2013-07-131-1/+1
| | | | | | | | | | | | Fixes handling of cases with unknown layouts but known channel counts Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/frame: Try to align width to achive linesize[0] alignmentMichael Niedermayer2013-06-181-4/+8
| | | | | | | | | | | | | | | | | | 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>
* | avutil/frame: continue to process bufs even if some are emptyXidorn Quan2013-05-201-3/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-05-151-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_*Anton Khirnov2013-05-151-1/+1
| |
* | lavu: add FF_CEIL_RSHIFT and use it in various places.Clément Bœsch2013-05-091-1/+1
| |
* | Merge commit '1e8b9738fa70e20967ddb542d2f9d5552fc51ec6'Michael Niedermayer2013-03-231-0/+4
|\| | | | | | | | | | | | | * commit '1e8b9738fa70e20967ddb542d2f9d5552fc51ec6': avutil/frame: add all remaining frame properties to av_frame_copy_props Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avutil/frame: add all remaining frame properties to av_frame_copy_propsHendrik Leppkes2013-03-221-0/+4
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | lavu/frame: use channels rather than channel_layout.Nicolas George2013-03-201-5/+16
| |
* | avutil/frame: fix video buffer allocationMichael Niedermayer2013-03-171-1/+1
| | | | | | | | | | | | | | | | 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>
* | avutil/frame: add AVBufferRef for qp tableMichael Niedermayer2013-03-151-0/+38
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavu/frame: free frame metadata when unrefing a frame.Hendrik Leppkes2013-03-131-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavu/frame: av_frame_make_writable: set the channels on the new frame.Hendrik Leppkes2013-03-131-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavu/frame: copy all frame properties in av_frame_copy_propsHendrik Leppkes2013-03-131-0/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avframe: Copy buffer type in copy_props.Carl Eugen Hoyos2013-03-131-0/+3
| | | | | | | | Fixes VDPAU decoding with MPlayer.
* | Merge commit 'd6d369bf1370999896500ae7eb5b9447ab635a3d'Michael Niedermayer2013-03-131-0/+1
|\| | | | | | | | | | | | | | | | | | | | | * commit 'd6d369bf1370999896500ae7eb5b9447ab635a3d': atomic: prefer gcc builtins over win32 atomics, if available. avframe: copy reordered_opaque in copy_props Conflicts: libavutil/frame.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avframe: copy reordered_opaque in copy_propsJanne Grunau2013-03-111-0/+1
| | | | | | | | Fixes video playback in applications still using reordered_opaque.
* | Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241'Michael Niedermayer2013-03-121-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '7b89cd20d844cbe763ca34e63e99d110043cf241': eamad: allocate a dummy reference frame when the real one is missing Replace remaining includes of audioconvert.h with channel_layout.h Replace some forgotten instances of PIX_FMT_* with AV_PIX_FMT_*. Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace remaining includes of audioconvert.h with channel_layout.hAnton Khirnov2013-03-081-1/+1
| |
* | get_video_buffer: add vertical paddingMichael Niedermayer2013-03-121-1/+1
| | | | | | | | | | | | Fix memory corruption Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '7e350379f87e7f74420b4813170fe808e2313911'Michael Niedermayer2013-03-101-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7e350379f87e7f74420b4813170fe808e2313911': lavfi: switch to AVFrame. Conflicts: doc/filters.texi libavfilter/af_ashowinfo.c libavfilter/audio.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersink.c libavfilter/buffersrc.c libavfilter/buffersrc.h libavfilter/f_select.c libavfilter/f_setpts.c libavfilter/fifo.c libavfilter/split.c libavfilter/src_movie.c libavfilter/version.h libavfilter/vf_aspect.c libavfilter/vf_bbox.c libavfilter/vf_blackframe.c libavfilter/vf_delogo.c libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_fieldorder.c libavfilter/vf_fps.c libavfilter/vf_frei0r.c libavfilter/vf_gradfun.c libavfilter/vf_hqdn3d.c libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_showinfo.c libavfilter/vf_transpose.c libavfilter/vf_vflip.c libavfilter/vf_yadif.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavfilter/yadif.h Following are notes about the merge authorship and various technical details. Michael Niedermayer: * Main merge operation, notably avfilter.c and video.c * Switch to AVFrame: - afade - anullsrc - apad - aresample - blackframe - deshake - idet - il - mandelbrot - mptestsrc - noise - setfield - smartblur - tinterlace * various merge changes and fixes in: - ashowinfo - blackdetect - field - fps - select - testsrc - yadif Nicolas George: * Switch to AVFrame: - make rawdec work with refcounted frames. Adapted from commit 759001c534287a96dc96d1e274665feb7059145d by Anton Khirnov. Also, fix the use of || instead of | in a flags check. - make buffer sink and src, audio and video work all together Clément Bœsch: * Switch to AVFrame: - aevalsrc - alphaextract - blend - cellauto - colormatrix - concat - earwax - ebur128 - edgedetect - geq - histeq - histogram - hue - kerndeint - life - movie - mp (with the help of Michael) - overlay - pad - pan - pp - pp - removelogo - sendcmd - showspectrum - showwaves - silencedetect - stereo3d - subtitles - super2xsai - swapuv - thumbnail - tile Hendrik Leppkes: * Switch to AVFrame: - aconvert - amerge - asetnsamples - atempo - biquads Matthieu Bouron: * Switch to AVFrame - alphamerge - decimate - volumedetect Stefano Sabatini: * Switch to AVFrame: - astreamsync - flite - framestep Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Clément Bœsch <ubitux@gmail.com> Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com> Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 04:30:22 +0000