diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-29 11:08:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-29 11:37:42 +0100 |
| commit | 74a9c92840d3494393938874c1cdd5bdb95cc918 (patch) | |
| tree | b114adeb0e0b49141a7a23ebb9411a0a3bee5ff8 | |
| parent | fead24141af0ed162b0bebd1764ab147690a02f3 (diff) | |
| parent | 4d2bb289318cce3fd1f6fded4468cc26f9d5c55e (diff) | |
| download | ffmpeg-74a9c92840d3494393938874c1cdd5bdb95cc918.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: namespace the decode function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 9dc909566a..c55e11c40f 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -5100,8 +5100,8 @@ static int output_frame(H264Context *h, AVFrame *dst, Picture *srcp) return 0; } -static int decode_frame(AVCodecContext *avctx, void *data, - int *got_frame, AVPacket *avpkt) +static int h264_decode_frame(AVCodecContext *avctx, void *data, + int *got_frame, AVPacket *avpkt) { const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; @@ -5288,7 +5288,7 @@ AVCodec ff_h264_decoder = { .priv_data_size = sizeof(H264Context), .init = ff_h264_decode_init, .close = h264_decode_end, - .decode = decode_frame, + .decode = h264_decode_frame, .capabilities = /*CODEC_CAP_DRAW_HORIZ_BAND |*/ CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_SLICE_THREADS | CODEC_CAP_FRAME_THREADS, @@ -5308,7 +5308,7 @@ AVCodec ff_h264_vdpau_decoder = { .priv_data_size = sizeof(H264Context), .init = ff_h264_decode_init, .close = h264_decode_end, - .decode = decode_frame, + .decode = h264_decode_frame, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_HWACCEL_VDPAU, .flush = flush_dpb, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_VDPAU_H264, |