aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/frame.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '8c02adc62d71dfbb079a04753d8c16152c49de88'Michael Niedermayer2014-06-011-42/+27
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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/+13
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'bddd8cbf68551f6405b2bf77cc3e212af9fbe834'Michael Niedermayer2014-05-191-0/+8
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'bddd8cbf68551f6405b2bf77cc3e212af9fbe834': Add transformation matrix API. Conflicts: libavcodec/avcodec.h libavcodec/utils.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add transformation matrix API.Vittorio Giovara2014-05-191-0/+8
| | | | | | | | | | | | | | | | | | | | | | Add AV_PKT_DATA_DISPLAYMATRIX and AV_FRAME_DATA_DISPLAYMATRIX as stream and frame side data (respectively) to describe a display transformation matrix for linear transformation operations on the decoded video. Add functions to easily extract a rotation angle from a matrix and conversely to setup a matrix for a given rotation angle. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avutil/frame: undeprecate AVFrame.motion_val APIMichael Niedermayer2014-03-261-2/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd161ae0a37900cbd36c1390ca32a56b892c02ab5'Michael Niedermayer2014-03-241-0/+6
|\| | | | | | | | | | | | | | | | | | | * 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/+6
| |
* | Merge commit '5a7e35dd2351c30bab45177b9482cb8833a0ca78'Michael Niedermayer2014-03-241-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '5a7e35dd2351c30bab45177b9482cb8833a0ca78': Add replaygain side data type and code for parsing replaygain tags. Conflicts: libavcodec/avcodec.h libavcodec/version.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add replaygain side data type and code for parsing replaygain tags.Anton Khirnov2014-03-241-0/+4
| |
* | Merge commit 'a18ef7a76c735bcf78ed4825e33ad7f9f6f77a54'Michael Niedermayer2014-03-041-1/+1
|\| | | | | | | | | | | | | | | | | | | * commit 'a18ef7a76c735bcf78ed4825e33ad7f9f6f77a54': doc: fix a couple of typos in frame.h Conflicts: libavutil/frame.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doc: fix a couple of typos in frame.hVittorio Giovara2014-03-041-1/+1
| |
* | Merge commit '1155fd02ae7bac215acab316e847c6bb25f74fc3'Michael Niedermayer2014-02-241-0/+13
|\| | | | | | | | | | | | | | | | | | | | | | | * 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-0/+13
| |
* | Merge commit 'c98f3169bfb578c1a4e407b44524f0bfa3b4dc0c'Michael Niedermayer2014-02-161-0/+5
|\| | | | | | | | | | | | | | | | | | | | | * commit 'c98f3169bfb578c1a4e407b44524f0bfa3b4dc0c': lavu: add AV_FRAME_DATA_DOWNMIX_INFO side data type. Conflicts: doc/APIchanges libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavu: add AV_FRAME_DATA_DOWNMIX_INFO side data type.Tim Walker2014-02-151-0/+5
| |
* | Merge commit '045654f422e74be8ed09a0819d39051d67633a09'Michael Niedermayer2014-01-171-1/+11
|\| | | | | | | | | | | | | * commit '045654f422e74be8ed09a0819d39051d67633a09': doxy: Document better the available AVFrame flags Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doxy: Document better the available AVFrame flagsLuca Barbato2014-01-171-1/+11
| |
* | Merge commit 'ff23c4e4935e96e62d8ff2212a1955a43add88e1'Michael Niedermayer2014-01-171-0/+19
|\| | | | | | | | | | | | | | | | | | | * commit 'ff23c4e4935e96e62d8ff2212a1955a43add88e1': doxy: Add AVFrame to the structured modules Conflicts: libavutil/frame.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doxy: Add AVFrame to the structured modulesLuca Barbato2014-01-171-0/+19
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-01-101-2/+1
|\| | | | | | | | | | | | | * qatar/master: avutil: do not use avcodec header in frame.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avutil: do not use avcodec header in frame.hVittorio Giovara2014-01-091-2/+1
| |
* | Merge commit '5b4797a21db900b7d509660b7a4d49829089b004'Michael Niedermayer2014-01-051-0/+4
|\| | | | | | | | | | | | | | | | | | | * commit '5b4797a21db900b7d509660b7a4d49829089b004': avframe: add AV_FRAME_DATA_MATRIXENCODING side data type. Conflicts: libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avframe: add AV_FRAME_DATA_MATRIXENCODING side data type.Tim Walker2014-01-051-0/+4
| | | | | | | | Includes a libavcodec utility function to update a frame's side data.
| * lavu: fix typo in documentation.Tim Walker2013-12-221-1/+1
| |
* | Merge commit '7e244c68600f479270e979258e389ed5240885fb'Michael Niedermayer2013-12-091-0/+5
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '7e244c68600f479270e979258e389ed5240885fb': avframe: add codec-independent stereoscopic metadata Conflicts: Changelog libavutil/Makefile libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avframe: add codec-independent stereoscopic metadataVittorio Giovara2013-12-091-0/+5
| |
* | Merge commit '1eaac1d6f7bb8e52d82e1a114c88a59a9a8e5025'Michael Niedermayer2013-11-261-0/+6
|\| | | | | | | | | | | | | | | | | | | | | * commit '1eaac1d6f7bb8e52d82e1a114c88a59a9a8e5025': mpeg12dec: Extract CC user data into frame side data Conflicts: doc/APIchanges libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg12dec: Extract CC user data into frame side dataJohn Stebbins2013-11-261-0/+6
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'cd8f772d0678a90957f4dfd5ce51af9d22e3f212'Michael Niedermayer2013-11-041-9/+12
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'cd8f772d0678a90957f4dfd5ce51af9d22e3f212': lavc: Add colorimetry values for BT.2020, other non-included ones Conflicts: doc/APIchanges libavcodec/avcodec.h libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '28096e0a806e57376541e6222d315619906e3c55'Michael Niedermayer2013-11-011-0/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '28096e0a806e57376541e6222d315619906e3c55': h264: wait for initial complete frame before outputing frames Conflicts: doc/APIchanges libavcodec/h264.c libavcodec/mpegvideo.h libavutil/frame.h libavutil/version.h See: a64b028aeb6579636e578ceb73f69b468bddb2f0 (as well as various later commits) Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: wait for initial complete frame before outputing framesJohn Stebbins2013-10-311-0/+10
| | | | | | | | | | | | | | | | This can be optionally disabled whith the "output_corrupt" flags option. When in "output_corrupt" mode, incomplete frames are signalled through AVFrame.flags FRAME_FLAG_INCOMPLETE_FRAME. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | 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>
* | Merge commit '38e15df1489d86c016515223ee693e7d0326c56a'Michael Niedermayer2013-09-281-0/+3
|\| | | | | | | | | | | | | | | | | | | * commit '38e15df1489d86c016515223ee693e7d0326c56a': avframe: note that linesize is not the usable data size Conflicts: libavutil/frame.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avframe: note that linesize is not the usable data sizeAnton Khirnov2013-09-281-0/+3
| |
* | avutil: add av_get_colorspace_name()Michael Niedermayer2013-09-191-0/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavu: fix grammar in doxy for av_frame_ref.Thilo Borgmann2013-08-111-1/+1
| | | | | | | | 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/+43
| | | | | | | | | | | | This also moves AVColorSpace and AVColorRange from avcodec to avutil Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | AVFrame.pkt_dts: improve docsMichael Niedermayer2013-03-191-1/+3
| | | | | | | | | | | | Related to Ticket2375 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/frame: typoMichael Niedermayer2013-03-181-1/+1
| | | | | | | | | | found by ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/frame: document alignment and padding requirementsMichael Niedermayer2013-03-181-0/+10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/frame: add AVBufferRef for qp tableMichael Niedermayer2013-03-151-0/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '8df23e938b4022d6e6e9e1180ea6418abae74fda'Michael Niedermayer2013-03-121-1/+25
|\| | | | | | | | | | | | | | | * commit '8df23e938b4022d6e6e9e1180ea6418abae74fda': lavc: postpone the removal of request_channels API. AVFrame: deprecate all now unused fields Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * AVFrame: deprecate all now unused fieldsAnton Khirnov2013-03-081-1/+25
| |
* | lavu/frame: fix not/note typo in doxy.Clément Bœsch2013-03-101-1/+1
| |
* | Merge commit '77b2cd7b41d7ec8008b6fac753c04f77824c514c'Michael Niedermayer2013-03-081-0/+38
|\| | | | | | | | | | | | | | | | | | | * commit '77b2cd7b41d7ec8008b6fac753c04f77824c514c': AVFrame: add side data. Conflicts: libavutil/frame.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * AVFrame: add side data.Anton Khirnov2013-03-081-0/+38
| |
* | Merge commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e'Michael Niedermayer2013-03-081-4/+101
|/ | | | | | | | | | * commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e': Move AVFrame from lavc to lavu. Conflicts: libavcodec/avcodec.h Merged-by: Michael Niedermayer <michaelni@gmx.at>