Luca Barbato
12 years ago
1 changed files with 3 additions and 3 deletions
Unified View
Diff Options
-
+3 -3libavcodec/h264.c
+ 3
- 3
libavcodec/h264.c
View File
| @@ -4853,8 +4853,8 @@ static int output_frame(H264Context *h, AVFrame *dst, AVFrame *src) | |||||
| return 0; | 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; | const uint8_t *buf = avpkt->data; | ||||
| int buf_size = avpkt->size; | int buf_size = avpkt->size; | ||||
| @@ -4989,7 +4989,7 @@ AVCodec ff_h264_decoder = { | |||||
| .priv_data_size = sizeof(H264Context), | .priv_data_size = sizeof(H264Context), | ||||
| .init = ff_h264_decode_init, | .init = ff_h264_decode_init, | ||||
| .close = h264_decode_end, | .close = h264_decode_end, | ||||
| .decode = decode_frame, | |||||
| .decode = h264_decode_frame, | |||||
| .capabilities = /*CODEC_CAP_DRAW_HORIZ_BAND |*/ CODEC_CAP_DR1 | | .capabilities = /*CODEC_CAP_DRAW_HORIZ_BAND |*/ CODEC_CAP_DR1 | | ||||
| CODEC_CAP_DELAY | CODEC_CAP_SLICE_THREADS | | CODEC_CAP_DELAY | CODEC_CAP_SLICE_THREADS | | ||||
| CODEC_CAP_FRAME_THREADS, | CODEC_CAP_FRAME_THREADS, | ||||