generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavd: do not use av_pix_fmt_descriptors directly

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol
2012-10-12 15:56:34 +00:00
parent 0d002de4a4
commit 82eba22667
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavdevice/caca.c
View File

@@ -140,7 +140,7 @@ static int caca_write_header(AVFormatContext *s)
goto fail; goto fail;
} }
bpp = av_get_bits_per_pixel(&av_pix_fmt_descriptors[encctx->pix_fmt]); bpp = av_get_bits_per_pixel(av_pix_fmt_desc_get(avctx->pix_fmt));
c->dither = caca_create_dither(bpp, encctx->width, encctx->height, c->dither = caca_create_dither(bpp, encctx->width, encctx->height,
bpp / 8 * encctx->width, bpp / 8 * encctx->width,
0x0000ff, 0x00ff00, 0xff0000, 0); 0x0000ff, 0x00ff00, 0xff0000, 0);

9
libavdevice/lavfi.c
View File

@@ -54,14 +54,17 @@ static int *create_all_formats(int n)
{ {
int i, j, *fmts, count = 0; int i, j, *fmts, count = 0;
for (i = 0; i < n; i++) for (i = 0; i < n; i++) {
if (!(av_pix_fmt_descriptors[i].flags & PIX_FMT_HWACCEL)) const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(i);
if (!(desc->flags & PIX_FMT_HWACCEL))
count++; count++;
}
if (!(fmts = av_malloc((count+1) * sizeof(int)))) if (!(fmts = av_malloc((count+1) * sizeof(int))))
return NULL; return NULL;
for (j = 0, i = 0; i < n; i++) { for (j = 0, i = 0; i < n; i++) {
if (!(av_pix_fmt_descriptors[i].flags & PIX_FMT_HWACCEL)) const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(i);
if (!(desc->flags & PIX_FMT_HWACCEL))
fmts[j++] = i; fmts[j++] = i;
} }
fmts[j] = -1; fmts[j] = -1;