Rename ff_VDPAU as ff_vdpau.

Originally committed as revision 16492 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index eb0274e..53cb838 100644 (file)
--- 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};
                && 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++;
             }
                 }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)
         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
 
         /*
          * FIXME: Error handling code does not seem to support interlaced

diff --git a/libavcodec/vdpau_internal.h b/libavcodec/vdpau_internal.h
index 1ac341e..6af2495 100644 (file)
--- a/libavcodec/vdpau_internal.h
+++ b/libavcodec/vdpau_internal.h
@@ -27,8 +27,8 @@
 #include <stdint.h>
 #include "h264.h"
 
 #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);
                                   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 */

diff --git a/libavcodec/vdpauvideo.c b/libavcodec/vdpauvideo.c
index af539ef..8b42823 100644 (file)
--- 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;
 {
     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;
 {
     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)
     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,
 
     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++;
 }
 
     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;
 {
     MpegEncContext * s = &h->s;
     struct vdpau_render_state * render;