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/ff_api-defines.inc | |
| 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/ff_api-defines.inc')
| -rw-r--r-- | src/lib/ffmpeg-2.6/ff_api-defines.inc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/lib/ffmpeg-2.6/ff_api-defines.inc b/src/lib/ffmpeg-2.6/ff_api-defines.inc index a964caaf..5c9b4bb2 100644 --- a/src/lib/ffmpeg-2.6/ff_api-defines.inc +++ b/src/lib/ffmpeg-2.6/ff_api-defines.inc @@ -8,6 +8,9 @@ *) (** avcodec defines *) +{$ifndef FF_API_VIMA_DECODER} +{$define FF_API_VIMA_DECODER := (LIBAVCODEC_VERSION_MAJOR < 57)} +{$endif} {$ifndef FF_API_REQUEST_CHANNELS} {$define FF_API_REQUEST_CHANNELS := (LIBAVCODEC_VERSION_MAJOR < 57)} {$endif} @@ -144,6 +147,9 @@ {$ifndef FF_API_MPV_OPT} {$define FF_API_MPV_OPT := (LIBAVCODEC_VERSION_MAJOR < 59)} {$endif} +{$ifndef FF_API_STREAM_CODEC_TAG} +{$define FF_API_STREAM_CODEC_TAG := (LIBAVCODEC_VERSION_MAJOR < 59)} +{$endif} (* avutil defines *) {$ifndef FF_API_GET_BITS_PER_SAMPLE_FMT} |