diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-04-29 18:53:57 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2011-05-02 12:18:44 +0200 |
| commit | 975a1447f76e8d30fc01e6ea5466c84faf3d76e4 (patch) | |
| tree | d462ee5cc7a2f59c44f797c97fc237c999c94e55 /libavcodec/libx264.c | |
| parent | 6209669de4a0aa056ae05b0a2c78eaf2ca489b23 (diff) | |
| download | ffmpeg-975a1447f76e8d30fc01e6ea5466c84faf3d76e4.tar.gz | |
Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diffstat (limited to 'libavcodec/libx264.c')
| -rw-r--r-- | libavcodec/libx264.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 58259458b5..bf5cbc501f 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -101,9 +101,9 @@ static int X264_frame(AVCodecContext *ctx, uint8_t *buf, x4->pic.i_pts = frame->pts; x4->pic.i_type = - frame->pict_type == FF_I_TYPE ? X264_TYPE_KEYFRAME : - frame->pict_type == FF_P_TYPE ? X264_TYPE_P : - frame->pict_type == FF_B_TYPE ? X264_TYPE_B : + frame->pict_type == AV_PICTURE_TYPE_I ? X264_TYPE_KEYFRAME : + frame->pict_type == AV_PICTURE_TYPE_P ? X264_TYPE_P : + frame->pict_type == AV_PICTURE_TYPE_B ? X264_TYPE_B : X264_TYPE_AUTO; if (x4->params.b_tff != frame->top_field_first) { x4->params.b_tff = frame->top_field_first; @@ -126,14 +126,14 @@ static int X264_frame(AVCodecContext *ctx, uint8_t *buf, switch (pic_out.i_type) { case X264_TYPE_IDR: case X264_TYPE_I: - x4->out_pic.pict_type = FF_I_TYPE; + x4->out_pic.pict_type = AV_PICTURE_TYPE_I; break; case X264_TYPE_P: - x4->out_pic.pict_type = FF_P_TYPE; + x4->out_pic.pict_type = AV_PICTURE_TYPE_P; break; case X264_TYPE_B: case X264_TYPE_BREF: - x4->out_pic.pict_type = FF_B_TYPE; + x4->out_pic.pict_type = AV_PICTURE_TYPE_B; break; } |