diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-04-28 01:40:44 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-05-02 16:41:41 +0200 |
| commit | ce5e49b0c2c11ec153834677fc5c903dd71d4e6e (patch) | |
| tree | d641bd887afa961820f6bc93727c9b0812b58aa1 /libavcodec/vdpau.c | |
| parent | 301183d9be4e426d472d4be8c84095c853cb8ac4 (diff) | |
| download | android_external_ffmpeg-ce5e49b0c2c11ec153834677fc5c903dd71d4e6e.tar.gz android_external_ffmpeg-ce5e49b0c2c11ec153834677fc5c903dd71d4e6e.tar.bz2 android_external_ffmpeg-ce5e49b0c2c11ec153834677fc5c903dd71d4e6e.zip | |
replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*
Diffstat (limited to 'libavcodec/vdpau.c')
| -rw-r--r-- | libavcodec/vdpau.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c index 55b2110c02..19bd96bc15 100644 --- a/libavcodec/vdpau.c +++ b/libavcodec/vdpau.c @@ -225,12 +225,12 @@ void ff_vdpau_mpeg_picture_complete(MpegEncContext *s, const uint8_t *buf, render->info.mpeg.backward_reference = VDP_INVALID_HANDLE; switch(s->pict_type){ - case FF_B_TYPE: + case AV_PICTURE_TYPE_B: next = (struct vdpau_render_state *)s->next_picture.data[0]; assert(next); render->info.mpeg.backward_reference = next->surface; // no return here, going to set forward prediction - case FF_P_TYPE: + case AV_PICTURE_TYPE_P: last = (struct vdpau_render_state *)s->last_picture.data[0]; if (!last) // FIXME: Does this test make sense? last = render; // predict second field from the first @@ -295,12 +295,12 @@ void ff_vdpau_vc1_decode_picture(MpegEncContext *s, const uint8_t *buf, render->info.vc1.picture_type = s->pict_type - 1 + s->pict_type / 3; switch(s->pict_type){ - case FF_B_TYPE: + case AV_PICTURE_TYPE_B: next = (struct vdpau_render_state *)s->next_picture.data[0]; assert(next); render->info.vc1.backward_reference = next->surface; // no break here, going to set forward prediction - case FF_P_TYPE: + case AV_PICTURE_TYPE_P: last = (struct vdpau_render_state *)s->last_picture.data[0]; if (!last) // FIXME: Does this test make sense? last = render; // predict second field from the first @@ -351,13 +351,13 @@ void ff_vdpau_mpeg4_decode_picture(MpegEncContext *s, const uint8_t *buf, render->info.mpeg4.backward_reference = VDP_INVALID_HANDLE; switch (s->pict_type) { - case FF_B_TYPE: + case AV_PICTURE_TYPE_B: next = (struct vdpau_render_state *)s->next_picture.data[0]; assert(next); render->info.mpeg4.backward_reference = next->surface; render->info.mpeg4.vop_coding_type = 2; // no break here, going to set forward prediction - case FF_P_TYPE: + case AV_PICTURE_TYPE_P: last = (struct vdpau_render_state *)s->last_picture.data[0]; assert(last); render->info.mpeg4.forward_reference = last->surface; |