comparison pnmenc.c @ 11560:8a4984c5cacc libavcodec

Define AVMediaType enum, and use it instead of enum CodecType, which is deprecated and will be dropped at the next major bump.
author stefano
date Tue, 30 Mar 2010 23:30:55 +0000
parents 64ffd3bcd73e
children
comparison
equal deleted inserted replaced
11559:444f4b594fdb 11560:8a4984c5cacc
113 113
114 114
115 #if CONFIG_PGM_ENCODER 115 #if CONFIG_PGM_ENCODER
116 AVCodec pgm_encoder = { 116 AVCodec pgm_encoder = {
117 "pgm", 117 "pgm",
118 CODEC_TYPE_VIDEO, 118 AVMEDIA_TYPE_VIDEO,
119 CODEC_ID_PGM, 119 CODEC_ID_PGM,
120 sizeof(PNMContext), 120 sizeof(PNMContext),
121 ff_pnm_init, 121 ff_pnm_init,
122 pnm_encode_frame, 122 pnm_encode_frame,
123 .pix_fmts = (const enum PixelFormat[]){PIX_FMT_GRAY8, PIX_FMT_GRAY16BE, PIX_FMT_NONE}, 123 .pix_fmts = (const enum PixelFormat[]){PIX_FMT_GRAY8, PIX_FMT_GRAY16BE, PIX_FMT_NONE},
126 #endif 126 #endif
127 127
128 #if CONFIG_PGMYUV_ENCODER 128 #if CONFIG_PGMYUV_ENCODER
129 AVCodec pgmyuv_encoder = { 129 AVCodec pgmyuv_encoder = {
130 "pgmyuv", 130 "pgmyuv",
131 CODEC_TYPE_VIDEO, 131 AVMEDIA_TYPE_VIDEO,
132 CODEC_ID_PGMYUV, 132 CODEC_ID_PGMYUV,
133 sizeof(PNMContext), 133 sizeof(PNMContext),
134 ff_pnm_init, 134 ff_pnm_init,
135 pnm_encode_frame, 135 pnm_encode_frame,
136 .pix_fmts = (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, 136 .pix_fmts = (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
139 #endif 139 #endif
140 140
141 #if CONFIG_PPM_ENCODER 141 #if CONFIG_PPM_ENCODER
142 AVCodec ppm_encoder = { 142 AVCodec ppm_encoder = {
143 "ppm", 143 "ppm",
144 CODEC_TYPE_VIDEO, 144 AVMEDIA_TYPE_VIDEO,
145 CODEC_ID_PPM, 145 CODEC_ID_PPM,
146 sizeof(PNMContext), 146 sizeof(PNMContext),
147 ff_pnm_init, 147 ff_pnm_init,
148 pnm_encode_frame, 148 pnm_encode_frame,
149 .pix_fmts = (const enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB48BE, PIX_FMT_NONE}, 149 .pix_fmts = (const enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB48BE, PIX_FMT_NONE},
152 #endif 152 #endif
153 153
154 #if CONFIG_PBM_ENCODER 154 #if CONFIG_PBM_ENCODER
155 AVCodec pbm_encoder = { 155 AVCodec pbm_encoder = {
156 "pbm", 156 "pbm",
157 CODEC_TYPE_VIDEO, 157 AVMEDIA_TYPE_VIDEO,
158 CODEC_ID_PBM, 158 CODEC_ID_PBM,
159 sizeof(PNMContext), 159 sizeof(PNMContext),
160 ff_pnm_init, 160 ff_pnm_init,
161 pnm_encode_frame, 161 pnm_encode_frame,
162 .pix_fmts = (const enum PixelFormat[]){PIX_FMT_MONOWHITE, PIX_FMT_NONE}, 162 .pix_fmts = (const enum PixelFormat[]){PIX_FMT_MONOWHITE, PIX_FMT_NONE},