MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests 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
commit 71d008ebe4
5 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/APIchanges
View File

@ -15,9 +15,9 @@ libavutil: 2012-10-22
API changes, most recent first:
2014-08-04 - xxxxxxx - lavc 55.72.101 - avcodec.h
2014-08-04 - xxxxxxx - lavu 52.95.100 - frame.h
Deprecate AVCodecContext.dtg_active_format and use side-data instead
2014-08-04 - xxxxxxx - lavc 55.72.101 / 55.57.2 - avcodec.h
2014-08-04 - xxxxxxx - lavu 52.95.100 / 53.20.0 - frame.h
Deprecate AVCodecContext.dtg_active_format and use side-data instead.
2014-08-03 - xxxxxxx - lavc 55.72.100 - avcodec.h
Add get_pixels() to AVDCT

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

2
libavfilter/vf_showinfo.c
View File

@ -148,7 +148,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
av_display_rotation_get((int32_t *)sd->data));
break;
case AV_FRAME_DATA_AFD:
av_log(ctx, AV_LOG_INFO, "afd: value of %u", sd->data[0]);
av_log(ctx, AV_LOG_INFO, "afd: value of %"PRIu8, sd->data[0]);
break;
default:
av_log(ctx, AV_LOG_WARNING, "unknown side data type %d (%d bytes)",

17
libavutil/frame.h
View File

@ -83,21 +83,20 @@ enum AVFrameSideDataType {
*/
AV_FRAME_DATA_DISPLAYMATRIX,
/**
* Active Format Description data consisting of a single byte as specified in ETSI TS 101 154
* using AVActiveFormatDescription enum
* Active Format Description data consisting of a single byte as specified
* in ETSI TS 101 154 using AVActiveFormatDescription enum.
*/
AV_FRAME_DATA_AFD,
};
enum AVActiveFormatDescription
{
AV_AFD_SAME = 8,
AV_AFD_4_3 = 9,
AV_AFD_16_9 = 10,
AV_AFD_14_9 = 11,
enum AVActiveFormatDescription {
AV_AFD_SAME = 8,
AV_AFD_4_3 = 9,
AV_AFD_16_9 = 10,
AV_AFD_14_9 = 11,
AV_AFD_4_3_SP_14_9 = 13,
AV_AFD_16_9_SP_14_9 = 14,
AV_AFD_SP_4_3 = 15
AV_AFD_SP_4_3 = 15,
};
typedef struct AVFrameSideData {