Revision 090846f3

View differences:

libavcodec/h264.c
7425 7425
               && avctx->skip_frame < AVDISCARD_ALL){
7426 7426
                if(ENABLE_H264_VDPAU_DECODER && avctx->codec_id == CODEC_ID_H264_VDPAU){
7427 7427
                    static const uint8_t start_code[] = {0x00, 0x00, 0x01};
7428
                    ff_VDPAU_h264_add_data_chunk(h, start_code, sizeof(start_code));
7429
                    ff_VDPAU_h264_add_data_chunk(h, &buf[buf_index - consumed], consumed );
7428
                    ff_vdpau_h264_add_data_chunk(h, start_code, sizeof(start_code));
7429
                    ff_vdpau_h264_add_data_chunk(h, &buf[buf_index - consumed], consumed );
7430 7430
                }else
7431 7431
                    context_count++;
7432 7432
            }
......
7633 7633
        h->prev_frame_num= h->frame_num;
7634 7634

  
7635 7635
        if (ENABLE_H264_VDPAU_DECODER && avctx->codec_id == CODEC_ID_H264_VDPAU)
7636
            ff_VDPAU_h264_picture_complete(h);
7636
            ff_vdpau_h264_picture_complete(h);
7637 7637

  
7638 7638
        /*
7639 7639
         * FIXME: Error handling code does not seem to support interlaced
libavcodec/vdpau_internal.h
27 27
#include <stdint.h>
28 28
#include "h264.h"
29 29

  
30
void ff_VDPAU_h264_add_data_chunk(H264Context *h, const uint8_t *buf,
30
void ff_vdpau_h264_add_data_chunk(H264Context *h, const uint8_t *buf,
31 31
                                  int buf_size);
32
void ff_VDPAU_h264_picture_complete(H264Context *h);
32
void ff_vdpau_h264_picture_complete(H264Context *h);
33 33

  
34 34
#endif /* AVCODEC_VDPAU_INTERNAL_H */
libavcodec/vdpauvideo.c
37 37
 * @{
38 38
 */
39 39

  
40
static void VDPAU_h264_set_reference_frames(H264Context *h)
40
static void vdpau_h264_set_reference_frames(H264Context *h)
41 41
{
42 42
    MpegEncContext * s = &h->s;
43 43
    struct vdpau_render_state * render, * render_ref;
......
106 106
    }
107 107
}
108 108

  
109
void ff_VDPAU_h264_add_data_chunk(H264Context *h, const uint8_t *buf, int buf_size)
109
void ff_vdpau_h264_add_data_chunk(H264Context *h, const uint8_t *buf, int buf_size)
110 110
{
111 111
    MpegEncContext * s = &h->s;
112 112
    struct vdpau_render_state * render;
......
115 115
    assert(render);
116 116

  
117 117
    if (!render->bitstream_buffers_used)
118
        VDPAU_h264_set_reference_frames(h);
118
        vdpau_h264_set_reference_frames(h);
119 119

  
120 120
    render->bitstream_buffers= av_fast_realloc(
121 121
        render->bitstream_buffers,
......
129 129
    render->bitstream_buffers_used++;
130 130
}
131 131

  
132
void ff_VDPAU_h264_picture_complete(H264Context *h)
132
void ff_vdpau_h264_picture_complete(H264Context *h)
133 133
{
134 134
    MpegEncContext * s = &h->s;
135 135
    struct vdpau_render_state * render;

Also available in: Unified diff