diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-16 21:14:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-16 23:30:09 +0100 |
| commit | b7fe35c9e50e1701274364adf7280bf4a02b092b (patch) | |
| tree | 05d5ffb039ce76bbc782d36704bdf8b135df50ce /libavcodec/vaapi_mpeg4.c | |
| parent | ddbbfd95bee4105fcb75f3b7c039b6c08efe36b4 (diff) | |
| parent | 2c541554076cc8a72e7145d4da30389ca763f32f (diff) | |
| download | ffmpeg-streaming-b7fe35c9e50e1701274364adf7280bf4a02b092b.zip ffmpeg-streaming-b7fe35c9e50e1701274364adf7280bf4a02b092b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: deMpegEncContextize
Conflicts:
libavcodec/dxva2_h264.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_loopfilter.c
libavcodec/h264_mb_template.c
libavcodec/h264_parser.c
libavcodec/h264_ps.c
libavcodec/h264_refs.c
libavcodec/h264_sei.c
libavcodec/svq3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vaapi_mpeg4.c')
| -rw-r--r-- | libavcodec/vaapi_mpeg4.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/libavcodec/vaapi_mpeg4.c b/libavcodec/vaapi_mpeg4.c index 3178740..bcc0eba 100644 --- a/libavcodec/vaapi_mpeg4.c +++ b/libavcodec/vaapi_mpeg4.c @@ -115,11 +115,6 @@ static int vaapi_mpeg4_start_frame(AVCodecContext *avctx, av_unused const uint8_ return 0; } -static int vaapi_mpeg4_end_frame(AVCodecContext *avctx) -{ - return ff_vaapi_common_end_frame(avctx->priv_data); -} - static int vaapi_mpeg4_decode_slice(AVCodecContext *avctx, const uint8_t *buffer, uint32_t size) { MpegEncContext * const s = avctx->priv_data; @@ -156,7 +151,7 @@ AVHWAccel ff_mpeg4_vaapi_hwaccel = { .id = AV_CODEC_ID_MPEG4, .pix_fmt = AV_PIX_FMT_VAAPI_VLD, .start_frame = vaapi_mpeg4_start_frame, - .end_frame = vaapi_mpeg4_end_frame, + .end_frame = ff_vaapi_mpeg_end_frame, .decode_slice = vaapi_mpeg4_decode_slice, }; #endif @@ -168,7 +163,7 @@ AVHWAccel ff_h263_vaapi_hwaccel = { .id = AV_CODEC_ID_H263, .pix_fmt = AV_PIX_FMT_VAAPI_VLD, .start_frame = vaapi_mpeg4_start_frame, - .end_frame = vaapi_mpeg4_end_frame, + .end_frame = ff_vaapi_mpeg_end_frame, .decode_slice = vaapi_mpeg4_decode_slice, }; #endif |
