virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

lavc: drop ff_pixfmt_list_420

Browse Source
This commit is contained in:
Vittorio Giovara 2014-03-17 18:03:47 +01:00
parent d5717bc4e9
commit 6f6c029464
10 changed files with 52 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/flvdec.c
View File

@ -129,5 +129,8 @@ AVCodec ff_flv_decoder = {
.close = ff_h263_decode_end, .close = ff_h263_decode_end,
.decode = ff_h263_decode_frame, .decode = ff_h263_decode_frame,
.capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
.pix_fmts = ff_pixfmt_list_420, .pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_YUV420P,
AV_PIX_FMT_NONE
},
}; };

5
libavcodec/intelh263dec.c
View File

@ -134,5 +134,8 @@ AVCodec ff_h263i_decoder = {
.close = ff_h263_decode_end, .close = ff_h263_decode_end,
.decode = ff_h263_decode_frame, .decode = ff_h263_decode_frame,
.capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
.pix_fmts = ff_pixfmt_list_420, .pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_YUV420P,
AV_PIX_FMT_NONE
},
}; };

5
libavcodec/mpegvideo.c
View File

@ -105,11 +105,6 @@ const uint8_t *const ff_mpeg2_dc_scale_table[4] = {
mpeg2_dc_scale_table3, mpeg2_dc_scale_table3,
}; };
const enum AVPixelFormat ff_pixfmt_list_420[] = {
AV_PIX_FMT_YUV420P,
AV_PIX_FMT_NONE
};
static void dct_unquantize_mpeg1_intra_c(MpegEncContext *s, static void dct_unquantize_mpeg1_intra_c(MpegEncContext *s,
int16_t *block, int n, int qscale) int16_t *block, int n, int qscale)
{ {

2
libavcodec/mpegvideo.h
View File

@ -735,8 +735,6 @@ void ff_MPV_motion(MpegEncContext *s,
*/ */
int ff_alloc_picture(MpegEncContext *s, Picture *pic, int shared); int ff_alloc_picture(MpegEncContext *s, Picture *pic, int shared);
extern const enum AVPixelFormat ff_pixfmt_list_420[];
/** /**
* permute block according to permuatation. * permute block according to permuatation.
* @param last last non zero element in scantable order * @param last last non zero element in scantable order

20
libavcodec/msmpeg4dec.c
View File

@ -911,7 +911,10 @@ AVCodec ff_msmpeg4v1_decoder = {
.close = ff_h263_decode_end, .close = ff_h263_decode_end,
.decode = ff_h263_decode_frame, .decode = ff_h263_decode_frame,
.capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
.pix_fmts = ff_pixfmt_list_420, .pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_YUV420P,
AV_PIX_FMT_NONE
},
}; };
AVCodec ff_msmpeg4v2_decoder = { AVCodec ff_msmpeg4v2_decoder = {
@ -924,7 +927,10 @@ AVCodec ff_msmpeg4v2_decoder = {
.close = ff_h263_decode_end, .close = ff_h263_decode_end,
.decode = ff_h263_decode_frame, .decode = ff_h263_decode_frame,
.capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
.pix_fmts = ff_pixfmt_list_420, .pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_YUV420P,
AV_PIX_FMT_NONE
},
}; };
AVCodec ff_msmpeg4v3_decoder = { AVCodec ff_msmpeg4v3_decoder = {
@ -937,7 +943,10 @@ AVCodec ff_msmpeg4v3_decoder = {
.close = ff_h263_decode_end, .close = ff_h263_decode_end,
.decode = ff_h263_decode_frame, .decode = ff_h263_decode_frame,
.capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
.pix_fmts = ff_pixfmt_list_420, .pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_YUV420P,
AV_PIX_FMT_NONE
},
}; };
AVCodec ff_wmv1_decoder = { AVCodec ff_wmv1_decoder = {
@ -950,5 +959,8 @@ AVCodec ff_wmv1_decoder = {
.close = ff_h263_decode_end, .close = ff_h263_decode_end,
.decode = ff_h263_decode_frame, .decode = ff_h263_decode_frame,
.capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
.pix_fmts = ff_pixfmt_list_420, .pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_YUV420P,
AV_PIX_FMT_NONE
},
}; };

10
libavcodec/rv10.c
View File

@ -769,7 +769,10 @@ AVCodec ff_rv10_decoder = {
.close = rv10_decode_end, .close = rv10_decode_end,
.decode = rv10_decode_frame, .decode = rv10_decode_frame,
.capabilities = CODEC_CAP_DR1, .capabilities = CODEC_CAP_DR1,
.pix_fmts = ff_pixfmt_list_420, .pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_YUV420P,
AV_PIX_FMT_NONE
},
}; };
AVCodec ff_rv20_decoder = { AVCodec ff_rv20_decoder = {
@ -783,5 +786,8 @@ AVCodec ff_rv20_decoder = {
.decode = rv10_decode_frame, .decode = rv10_decode_frame,
.capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY,
.flush = ff_mpeg_flush, .flush = ff_mpeg_flush,
.pix_fmts = ff_pixfmt_list_420, .pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_YUV420P,
AV_PIX_FMT_NONE
},
}; };

5
libavcodec/rv30.c
View File

@ -285,7 +285,10 @@ AVCodec ff_rv30_decoder = {
.capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY | .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY |
CODEC_CAP_FRAME_THREADS, CODEC_CAP_FRAME_THREADS,
.flush = ff_mpeg_flush, .flush = ff_mpeg_flush,
.pix_fmts = ff_pixfmt_list_420, .pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_YUV420P,
AV_PIX_FMT_NONE
},
.init_thread_copy = ONLY_IF_THREADS_ENABLED(ff_rv34_decode_init_thread_copy), .init_thread_copy = ONLY_IF_THREADS_ENABLED(ff_rv34_decode_init_thread_copy),
.update_thread_context = ONLY_IF_THREADS_ENABLED(ff_rv34_decode_update_thread_context), .update_thread_context = ONLY_IF_THREADS_ENABLED(ff_rv34_decode_update_thread_context),
}; };

5
libavcodec/rv40.c
View File

@ -573,7 +573,10 @@ AVCodec ff_rv40_decoder = {
.capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY | .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY |
CODEC_CAP_FRAME_THREADS, CODEC_CAP_FRAME_THREADS,
.flush = ff_mpeg_flush, .flush = ff_mpeg_flush,
.pix_fmts = ff_pixfmt_list_420, .pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_YUV420P,
AV_PIX_FMT_NONE
},
.init_thread_copy = ONLY_IF_THREADS_ENABLED(ff_rv34_decode_init_thread_copy), .init_thread_copy = ONLY_IF_THREADS_ENABLED(ff_rv34_decode_init_thread_copy),
.update_thread_context = ONLY_IF_THREADS_ENABLED(ff_rv34_decode_update_thread_context), .update_thread_context = ONLY_IF_THREADS_ENABLED(ff_rv34_decode_update_thread_context),
}; };

10
libavcodec/vc1dec.c
View File

@ -6179,7 +6179,10 @@ AVCodec ff_wmv3image_decoder = {
.decode = vc1_decode_frame, .decode = vc1_decode_frame,
.capabilities = CODEC_CAP_DR1, .capabilities = CODEC_CAP_DR1,
.flush = vc1_sprite_flush, .flush = vc1_sprite_flush,
.pix_fmts = ff_pixfmt_list_420 .pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_YUV420P,
AV_PIX_FMT_NONE
},
}; };
#endif #endif
@ -6195,6 +6198,9 @@ AVCodec ff_vc1image_decoder = {
.decode = vc1_decode_frame, .decode = vc1_decode_frame,
.capabilities = CODEC_CAP_DR1, .capabilities = CODEC_CAP_DR1,
.flush = vc1_sprite_flush, .flush = vc1_sprite_flush,
.pix_fmts = ff_pixfmt_list_420 .pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_YUV420P,
AV_PIX_FMT_NONE
},
}; };
#endif #endif

5
libavcodec/wmv2dec.c
View File

@ -475,5 +475,8 @@ AVCodec ff_wmv2_decoder = {
.close = wmv2_decode_end, .close = wmv2_decode_end,
.decode = ff_h263_decode_frame, .decode = ff_h263_decode_frame,
.capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
.pix_fmts = ff_pixfmt_list_420, .pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_YUV420P,
AV_PIX_FMT_NONE
},
}; };