diff options
| author | brian-ch <brian-ch@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2015-04-12 18:32:49 +0000 |
|---|---|---|
| committer | brian-ch <brian-ch@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2015-04-12 18:32:49 +0000 |
| commit | a57eddf010cd07cb6744ef89d3df8661c121d23c (patch) | |
| tree | baaef88b26b87703239cce6b05b8c09ba2aea6a1 /src/lib/ffmpeg-2.6/libavutil/frame.pas | |
| parent | f80199e9dfde699a8c6c3de5e182f64755805efd (diff) | |
| download | usdx-a57eddf010cd07cb6744ef89d3df8661c121d23c.tar.gz usdx-a57eddf010cd07cb6744ef89d3df8661c121d23c.tar.xz usdx-a57eddf010cd07cb6744ef89d3df8661c121d23c.zip | |
Update ffmpeg 2.6 headers
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3114 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src/lib/ffmpeg-2.6/libavutil/frame.pas')
| -rw-r--r-- | src/lib/ffmpeg-2.6/libavutil/frame.pas | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/lib/ffmpeg-2.6/libavutil/frame.pas b/src/lib/ffmpeg-2.6/libavutil/frame.pas index 87eb21ff..f47f2397 100644 --- a/src/lib/ffmpeg-2.6/libavutil/frame.pas +++ b/src/lib/ffmpeg-2.6/libavutil/frame.pas @@ -157,7 +157,13 @@ type * u8 reason for end skip (0=padding silence, 1=convergence) * @endcode *) - AV_FRAME_DATA_SKIP_SAMPLES + AV_FRAME_DATA_SKIP_SAMPLES, + + (** + * This side data must be associated with an audio frame and corresponds to + * enum AVAudioServiceType defined in avcodec.h. + *) + AV_FRAME_DATA_AUDIO_SERVICE_TYPE ); TAVActiveFormatDescription = ( @@ -452,7 +458,9 @@ type (** * AVBuffer references backing the data for this frame. If all elements of - * this array are NULL, then this frame is not reference counted. + * this array are NULL, then this frame is not reference counted. This array + * must be filled contiguously -- if buf[i] is non-NULL then buf[j] must + * also be non-NULL for all j < i. * * There may be at most one AVBuffer per data plane, so for video this array * always contains all the references. For planar audio with more than |