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/h264pred.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/h264pred.c')
| -rw-r--r-- | libavcodec/h264pred.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/h264pred.c b/libavcodec/h264pred.c index 29c529a..1339b2a 100644 --- a/libavcodec/h264pred.c +++ b/libavcodec/h264pred.c @@ -410,8 +410,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, int chroma_format_idc) { -// MpegEncContext * const s = &h->s; - #undef FUNC #undef FUNCC #define FUNC(a, depth) a ## _ ## depth |
