Commit 8829c9b7 authored by vitor's avatar vitor

Do not hardcode the list of pixel formats and use PIX_FMT_NB instead.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@11898 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent a98043ed
...@@ -85,23 +85,17 @@ AVFilterFormats *avfilter_make_format_list(int len, ...) ...@@ -85,23 +85,17 @@ AVFilterFormats *avfilter_make_format_list(int len, ...)
AVFilterFormats *avfilter_all_colorspaces(void) AVFilterFormats *avfilter_all_colorspaces(void)
{ {
return avfilter_make_format_list(35, AVFilterFormats *ret;
PIX_FMT_YUV444P, PIX_FMT_YUV422P, PIX_FMT_YUV420P, int i;
PIX_FMT_YUV411P, PIX_FMT_YUV410P,
PIX_FMT_YUYV422, PIX_FMT_UYVY422, PIX_FMT_UYYVYY411, ret = av_mallocz(sizeof(AVFilterFormats));
PIX_FMT_YUVJ444P, PIX_FMT_YUVJ422P, PIX_FMT_YUVJ420P, ret->formats = av_malloc(sizeof(*ret->formats) * PIX_FMT_NB);
PIX_FMT_YUV440P, PIX_FMT_YUVJ440P, ret->format_count = PIX_FMT_NB;
PIX_FMT_RGB32, PIX_FMT_BGR32,
PIX_FMT_RGB32_1, PIX_FMT_BGR32_1, for(i = 0; i < PIX_FMT_NB; i ++)
PIX_FMT_RGB24, PIX_FMT_BGR24, ret->formats[i] = i;
PIX_FMT_RGB565, PIX_FMT_BGR565,
PIX_FMT_RGB555, PIX_FMT_BGR555, return ret;
PIX_FMT_RGB8, PIX_FMT_BGR8,
PIX_FMT_RGB4_BYTE,PIX_FMT_BGR4_BYTE,
PIX_FMT_GRAY16BE, PIX_FMT_GRAY16LE,
PIX_FMT_GRAY8, PIX_FMT_PAL8,
PIX_FMT_MONOWHITE,PIX_FMT_MONOBLACK,
PIX_FMT_NV12, PIX_FMT_NV21);
} }
void avfilter_formats_ref(AVFilterFormats *f, AVFilterFormats **ref) void avfilter_formats_ref(AVFilterFormats *f, AVFilterFormats **ref)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment