Mercurial > libavcodec.hg
comparison mpeg12.c @ 5182:874d9b7641e3 libavcodec
get rid of one unneeded #ifdef HAVE_XVMC
author | michael |
---|---|
date | Fri, 22 Jun 2007 17:18:58 +0000 |
parents | 0244bba24b43 |
children | 430f60820b21 |
comparison
equal
deleted
inserted
replaced
5181:13b0682bdf11 | 5182:874d9b7641e3 |
---|---|
67 static inline int mpeg2_fast_decode_block_non_intra(MpegEncContext *s, DCTELEM *block, int n); | 67 static inline int mpeg2_fast_decode_block_non_intra(MpegEncContext *s, DCTELEM *block, int n); |
68 static inline int mpeg2_fast_decode_block_intra(MpegEncContext *s, DCTELEM *block, int n); | 68 static inline int mpeg2_fast_decode_block_intra(MpegEncContext *s, DCTELEM *block, int n); |
69 static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred); | 69 static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred); |
70 static void exchange_uv(MpegEncContext *s); | 70 static void exchange_uv(MpegEncContext *s); |
71 | 71 |
72 #ifdef HAVE_XVMC | |
73 extern int XVMC_field_start(MpegEncContext *s, AVCodecContext *avctx); | 72 extern int XVMC_field_start(MpegEncContext *s, AVCodecContext *avctx); |
74 extern int XVMC_field_end(MpegEncContext *s); | 73 extern int XVMC_field_end(MpegEncContext *s); |
75 extern void XVMC_pack_pblocks(MpegEncContext *s,int cbp); | 74 extern void XVMC_pack_pblocks(MpegEncContext *s,int cbp); |
76 extern void XVMC_init_block(MpegEncContext *s);//set s->block | 75 extern void XVMC_init_block(MpegEncContext *s);//set s->block |
77 #endif | |
78 | 76 |
79 static const enum PixelFormat pixfmt_yuv_420[]= {PIX_FMT_YUV420P,-1}; | 77 static const enum PixelFormat pixfmt_yuv_420[]= {PIX_FMT_YUV420P,-1}; |
80 static const enum PixelFormat pixfmt_yuv_422[]= {PIX_FMT_YUV422P,-1}; | 78 static const enum PixelFormat pixfmt_yuv_422[]= {PIX_FMT_YUV422P,-1}; |
81 static const enum PixelFormat pixfmt_yuv_444[]= {PIX_FMT_YUV444P,-1}; | 79 static const enum PixelFormat pixfmt_yuv_444[]= {PIX_FMT_YUV444P,-1}; |
82 static const enum PixelFormat pixfmt_xvmc_mpg2_420[] = { | 80 static const enum PixelFormat pixfmt_xvmc_mpg2_420[] = { |