Commit 090846f3 authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos

Rename ff_VDPAU as ff_vdpau.

Originally committed as revision 16492 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 6cc01c24
...@@ -7425,8 +7425,8 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size){ ...@@ -7425,8 +7425,8 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size){
&& avctx->skip_frame < AVDISCARD_ALL){ && avctx->skip_frame < AVDISCARD_ALL){
if(ENABLE_H264_VDPAU_DECODER && avctx->codec_id == CODEC_ID_H264_VDPAU){ if(ENABLE_H264_VDPAU_DECODER && avctx->codec_id == CODEC_ID_H264_VDPAU){
static const uint8_t start_code[] = {0x00, 0x00, 0x01}; 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, start_code, sizeof(start_code));
ff_VDPAU_h264_add_data_chunk(h, &buf[buf_index - consumed], consumed ); ff_vdpau_h264_add_data_chunk(h, &buf[buf_index - consumed], consumed );
}else }else
context_count++; context_count++;
} }
...@@ -7633,7 +7633,7 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -7633,7 +7633,7 @@ static int decode_frame(AVCodecContext *avctx,
h->prev_frame_num= h->frame_num; h->prev_frame_num= h->frame_num;
if (ENABLE_H264_VDPAU_DECODER && avctx->codec_id == CODEC_ID_H264_VDPAU) 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 * FIXME: Error handling code does not seem to support interlaced
......
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
#include <stdint.h> #include <stdint.h>
#include "h264.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); int buf_size);
void ff_VDPAU_h264_picture_complete(H264Context *h); void ff_vdpau_h264_picture_complete(H264Context *h);
#endif /* AVCODEC_VDPAU_INTERNAL_H */ #endif /* AVCODEC_VDPAU_INTERNAL_H */
...@@ -37,7 +37,7 @@ ...@@ -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; MpegEncContext * s = &h->s;
struct vdpau_render_state * render, * render_ref; struct vdpau_render_state * render, * render_ref;
...@@ -106,7 +106,7 @@ static void VDPAU_h264_set_reference_frames(H264Context *h) ...@@ -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; MpegEncContext * s = &h->s;
struct vdpau_render_state * render; 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 ...@@ -115,7 +115,7 @@ void ff_VDPAU_h264_add_data_chunk(H264Context *h, const uint8_t *buf, int buf_si
assert(render); assert(render);
if (!render->bitstream_buffers_used) 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= av_fast_realloc(
render->bitstream_buffers, render->bitstream_buffers,
...@@ -129,7 +129,7 @@ void ff_VDPAU_h264_add_data_chunk(H264Context *h, const uint8_t *buf, int buf_si ...@@ -129,7 +129,7 @@ void ff_VDPAU_h264_add_data_chunk(H264Context *h, const uint8_t *buf, int buf_si
render->bitstream_buffers_used++; render->bitstream_buffers_used++;
} }
void ff_VDPAU_h264_picture_complete(H264Context *h) void ff_vdpau_h264_picture_complete(H264Context *h)
{ {
MpegEncContext * s = &h->s; MpegEncContext * s = &h->s;
struct vdpau_render_state * render; struct vdpau_render_state * render;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment