diff options
| author | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2009-01-07 23:48:32 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2009-01-07 23:48:32 +0000 |
| commit | 090846f3b97dfb5c184f2d5afb589fd10eb53a18 (patch) | |
| tree | ed18b2a430bd2c76a36dd5144e3cc5c0aa1f5050 /libavcodec | |
| parent | 6cc01c245fc700598b961230999520d95726165d (diff) | |
Rename ff_VDPAU as ff_vdpau.
Originally committed as revision 16492 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.c | 6 | ||||
| -rw-r--r-- | libavcodec/vdpau_internal.h | 4 | ||||
| -rw-r--r-- | libavcodec/vdpauvideo.c | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index eb0274e678..53cb83890d 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -7425,8 +7425,8 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size){ && avctx->skip_frame < AVDISCARD_ALL){ if(ENABLE_H264_VDPAU_DECODER && avctx->codec_id == CODEC_ID_H264_VDPAU){ static const uint8_t start_code[] = {0x00, 0x00, 0x01}; - ff_VDPAU_h264_add_data_chunk(h, start_code, sizeof(start_code)); - ff_VDPAU_h264_add_data_chunk(h, &buf[buf_index - consumed], consumed ); + ff_vdpau_h264_add_data_chunk(h, start_code, sizeof(start_code)); + ff_vdpau_h264_add_data_chunk(h, &buf[buf_index - consumed], consumed ); }else context_count++; } @@ -7633,7 +7633,7 @@ static int decode_frame(AVCodecContext *avctx, h->prev_frame_num= h->frame_num; if (ENABLE_H264_VDPAU_DECODER && avctx->codec_id == CODEC_ID_H264_VDPAU) - ff_VDPAU_h264_picture_complete(h); + ff_vdpau_h264_picture_complete(h); /* * FIXME: Error handling code does not seem to support interlaced diff --git a/libavcodec/vdpau_internal.h b/libavcodec/vdpau_internal.h index 1ac341e2f5..6af24959c8 100644 --- a/libavcodec/vdpau_internal.h +++ b/libavcodec/vdpau_internal.h @@ -27,8 +27,8 @@ #include <stdint.h> #include "h264.h" -void ff_VDPAU_h264_add_data_chunk(H264Context *h, const uint8_t *buf, +void ff_vdpau_h264_add_data_chunk(H264Context *h, const uint8_t *buf, int buf_size); -void ff_VDPAU_h264_picture_complete(H264Context *h); +void ff_vdpau_h264_picture_complete(H264Context *h); #endif /* AVCODEC_VDPAU_INTERNAL_H */ diff --git a/libavcodec/vdpauvideo.c b/libavcodec/vdpauvideo.c index af539ef8b6..8b42823486 100644 --- a/libavcodec/vdpauvideo.c +++ b/libavcodec/vdpauvideo.c @@ -37,7 +37,7 @@ * @{ */ -static void VDPAU_h264_set_reference_frames(H264Context *h) +static void vdpau_h264_set_reference_frames(H264Context *h) { MpegEncContext * s = &h->s; struct vdpau_render_state * render, * render_ref; @@ -106,7 +106,7 @@ static void VDPAU_h264_set_reference_frames(H264Context *h) } } -void ff_VDPAU_h264_add_data_chunk(H264Context *h, const uint8_t *buf, int buf_size) +void ff_vdpau_h264_add_data_chunk(H264Context *h, const uint8_t *buf, int buf_size) { MpegEncContext * s = &h->s; struct vdpau_render_state * render; @@ -115,7 +115,7 @@ void ff_VDPAU_h264_add_data_chunk(H264Context *h, const uint8_t *buf, int buf_si assert(render); if (!render->bitstream_buffers_used) - VDPAU_h264_set_reference_frames(h); + vdpau_h264_set_reference_frames(h); render->bitstream_buffers= av_fast_realloc( render->bitstream_buffers, @@ -129,7 +129,7 @@ void ff_VDPAU_h264_add_data_chunk(H264Context *h, const uint8_t *buf, int buf_si render->bitstream_buffers_used++; } -void ff_VDPAU_h264_picture_complete(H264Context *h) +void ff_vdpau_h264_picture_complete(H264Context *h) { MpegEncContext * s = &h->s; struct vdpau_render_state * render; |