summaryrefslogtreecommitdiff
path: root/libavcodec/avcodec.h
diff options
context:
space:
mode:
authorKieran Kunhya <kierank@obe.tv>2014-08-03 19:24:56 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-08-04 05:36:44 +0200
commit2a3c36e920d958e99fb4edf065a6713c30f2c2a9 (patch)
treee9a75b83c7cdcd9bc0f24a7bcf3f0183058c8422 /libavcodec/avcodec.h
parent2793b218bdd59db51f1f5c960c508fea7190310e (diff)
Deprecate AFD field and add AFD as side-data
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r--libavcodec/avcodec.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 6ef9da40df..8ba58516b4 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1690,6 +1690,7 @@ typedef struct AVCodecContext {
*/
int me_subpel_quality;
+#if FF_API_AFD
/**
* DTG active format information (additional aspect ratio
* information only used in DVB MPEG-2 transport streams)
@@ -1697,8 +1698,9 @@ typedef struct AVCodecContext {
*
* - encoding: unused
* - decoding: Set by decoder.
+ * @deprecated Deprecated in favour of AVSideData
*/
- int dtg_active_format;
+ attribute_deprecated int dtg_active_format;
#define FF_DTG_AFD_SAME 8
#define FF_DTG_AFD_4_3 9
#define FF_DTG_AFD_16_9 10
@@ -1706,6 +1708,7 @@ typedef struct AVCodecContext {
#define FF_DTG_AFD_4_3_SP_14_9 13
#define FF_DTG_AFD_16_9_SP_14_9 14
#define FF_DTG_AFD_SP_4_3 15
+#endif
/**
* maximum motion estimation search range in subpel units