summaryrefslogtreecommitdiffstats
path: root/libavcodec/h264pred.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2013-02-03 11:10:05 +0100
committerAnton Khirnov <anton@khirnov.net>2013-02-15 16:35:16 +0100
commit2c541554076cc8a72e7145d4da30389ca763f32f (patch)
treeb404051a202e1ffffe4ecee2df1b89f9f92a70f5 /libavcodec/h264pred.c
parent1d0feb5d1ac04d187b335f0e8d411c9f40b3a885 (diff)
downloadffmpeg-streaming-2c541554076cc8a72e7145d4da30389ca763f32f.zip
ffmpeg-streaming-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/h264pred.c')
-rw-r--r--libavcodec/h264pred.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/h264pred.c b/libavcodec/h264pred.c
index 94cf9d0..48a4a79 100644
--- a/libavcodec/h264pred.c
+++ b/libavcodec/h264pred.c
@@ -399,8 +399,6 @@ static void pred8x8_tm_vp8_c(uint8_t *src, ptrdiff_t stride)
void ff_h264_pred_init(H264PredContext *h, int codec_id, const int bit_depth,
const int chroma_format_idc)
{
-// MpegEncContext * const s = &h->s;
-
#undef FUNC
#undef FUNCC
#define FUNC(a, depth) a ## _ ## depth
OpenPOWER on IntegriCloud