diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-02-03 11:10:05 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-02-15 16:35:16 +0100 |
| commit | 2c541554076cc8a72e7145d4da30389ca763f32f (patch) | |
| tree | b404051a202e1ffffe4ecee2df1b89f9f92a70f5 /libavcodec/vdpau_mpeg4.c | |
| parent | 1d0feb5d1ac04d187b335f0e8d411c9f40b3a885 (diff) | |
| download | ffmpeg-2c541554076cc8a72e7145d4da30389ca763f32f.tar.gz | |
h264: deMpegEncContextize
Most of the changes are just trivial are just trivial replacements of
fields from MpegEncContext with equivalent fields in H264Context.
Everything in h264* other than h264.c are those trivial changes.
The nontrivial parts are:
1) extracting a simplified version of the frame management code from
mpegvideo.c. We don't need last/next_picture anymore, since h264 uses
its own more complex system already and those were set only to appease
the mpegvideo parts.
2) some tables that need to be allocated/freed in appropriate places.
3) hwaccels -- mostly trivial replacements.
for dxva, the draw_horiz_band() call is moved from
ff_dxva2_common_end_frame() to per-codec end_frame() callbacks,
because it's now different for h264 and MpegEncContext-based
decoders.
4) svq3 -- it does not use h264 complex reference system, so I just
added some very simplistic frame management instead and dropped the
use of ff_h264_frame_start(). Because of this I also had to move some
initialization code to svq3.
Additional fixes for chroma format and bit depth changes by
Janne Grunau <janne-libav@jannau.net>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavcodec/vdpau_mpeg4.c')
| -rw-r--r-- | libavcodec/vdpau_mpeg4.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/vdpau_mpeg4.c b/libavcodec/vdpau_mpeg4.c index 706e2b689e..65558723e6 100644 --- a/libavcodec/vdpau_mpeg4.c +++ b/libavcodec/vdpau_mpeg4.c @@ -92,7 +92,7 @@ AVHWAccel ff_h263_vdpau_hwaccel = { .id = AV_CODEC_ID_H263, .pix_fmt = AV_PIX_FMT_VDPAU, .start_frame = vdpau_mpeg4_start_frame, - .end_frame = ff_vdpau_common_end_frame, + .end_frame = ff_vdpau_mpeg_end_frame, .decode_slice = vdpau_mpeg4_decode_slice, }; #endif @@ -104,7 +104,7 @@ AVHWAccel ff_mpeg4_vdpau_hwaccel = { .id = AV_CODEC_ID_MPEG4, .pix_fmt = AV_PIX_FMT_VDPAU, .start_frame = vdpau_mpeg4_start_frame, - .end_frame = ff_vdpau_common_end_frame, + .end_frame = ff_vdpau_mpeg_end_frame, .decode_slice = vdpau_mpeg4_decode_slice, }; #endif |