diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 05:44:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 06:11:34 +0200 |
| commit | 71d008ebe4f96974433eecfd3575bc82eb4b06a8 (patch) | |
| tree | 6b898f04697be62866d297dfd300e591b37c9924 /libavcodec | |
| parent | 2a3c36e920d958e99fb4edf065a6713c30f2c2a9 (diff) | |
| parent | 1ef9e8376466bb1e2c147e47554b94cab9c8b04a (diff) | |
Merge commit '1ef9e8376466bb1e2c147e47554b94cab9c8b04a'
* commit '1ef9e8376466bb1e2c147e47554b94cab9c8b04a':
avcodec: Deprecate dtg_active_format field in favor of avframe side-data
Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/mpeg12dec.c
libavcodec/version.h
libavfilter/vf_showinfo.c
libavutil/frame.h
libavutil/version.h
See: 2a3c36e920d958e99fb4edf065a6713c30f2c2a9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 4 | ||||
| -rw-r--r-- | libavcodec/mpeg12dec.c | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 8ba58516b4..efe94eeb6c 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1698,7 +1698,7 @@ typedef struct AVCodecContext { * * - encoding: unused * - decoding: Set by decoder. - * @deprecated Deprecated in favour of AVSideData + * @deprecated Deprecated in favor of AVSideData */ attribute_deprecated int dtg_active_format; #define FF_DTG_AFD_SAME 8 @@ -1708,7 +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 +#endif /* FF_API_AFD */ /** * maximum motion estimation search range in subpel units diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index f4582ef1ec..3b769dfb77 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1663,13 +1663,13 @@ static int mpeg_field_start(MpegEncContext *s, const uint8_t *buf, int buf_size) } if (s1->has_afd) { - AVFrameSideData *sd = av_frame_new_side_data( - s->current_picture_ptr->f, AV_FRAME_DATA_AFD, - 1); + AVFrameSideData *sd = + av_frame_new_side_data(s->current_picture_ptr->f, + AV_FRAME_DATA_AFD, 1); if (!sd) return AVERROR(ENOMEM); - *sd->data = s1->afd; + *sd->data = s1->afd; s1->has_afd = 0; } @@ -2278,7 +2278,7 @@ static void mpeg_decode_user_data(AVCodecContext *avctx, { Mpeg1Context *s = avctx->priv_data; const uint8_t *buf_end = p + buf_size; - Mpeg1Context *s1 = avctx->priv_data; + Mpeg1Context *s1 = avctx->priv_data; if (buf_size > 29){ int i; @@ -2307,9 +2307,9 @@ static void mpeg_decode_user_data(AVCodecContext *avctx, return; #if FF_API_AFD avctx->dtg_active_format = p[0] & 0x0f; -#endif +#endif /* FF_API_AFD */ s1->has_afd = 1; - s1->afd = p[0] & 0x0f; + s1->afd = p[0] & 0x0f; } } else if (buf_end - p >= 6 && p[0] == 'J' && p[1] == 'P' && p[2] == '3' && p[3] == 'D' && |