breeze/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-02-04 14:30:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '1ef9e8376466bb1e2c147e47554b94cab9c8b04a'

Browse Source 
* 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: 2a3c36e920
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-08-04 05:44:00 +02:00
parent 2a3c36e920 1ef9e83764
commit 71d008ebe4
5 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/avcodec.h
View File

@@ -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

14
libavcodec/mpeg12dec.c
View File

@@ -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' &&