Commit ddce2b26 authored by James Almer's avatar James Almer Committed by Michael Niedermayer

tools/fourcc2pixfmt: use avpriv_get_raw_pix_fmt_tags()

lavc doesn't export ff_raw_pix_fmt_tags[] anymore.
Signed-off-by: 's avatarJames Almer <jamrial@gmail.com>
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent e18d9d90
...@@ -47,14 +47,14 @@ static void usage(void) ...@@ -47,14 +47,14 @@ static void usage(void)
"-h print this help\n"); "-h print this help\n");
} }
static void print_pix_fmt_fourccs(enum AVPixelFormat pix_fmt, char sep) static void print_pix_fmt_fourccs(enum AVPixelFormat pix_fmt, const PixelFormatTag *pix_fmt_tags, char sep)
{ {
int i; int i;
for (i = 0; ff_raw_pix_fmt_tags[i].pix_fmt != AV_PIX_FMT_NONE; i++) { for (i = 0; pix_fmt_tags[i].pix_fmt != AV_PIX_FMT_NONE; i++) {
if (ff_raw_pix_fmt_tags[i].pix_fmt == pix_fmt) { if (pix_fmt_tags[i].pix_fmt == pix_fmt) {
char buf[32]; char buf[32];
av_get_codec_tag_string(buf, sizeof(buf), ff_raw_pix_fmt_tags[i].fourcc); av_get_codec_tag_string(buf, sizeof(buf), pix_fmt_tags[i].fourcc);
printf("%s%c", buf, sep); printf("%s%c", buf, sep);
} }
} }
...@@ -63,6 +63,7 @@ static void print_pix_fmt_fourccs(enum AVPixelFormat pix_fmt, char sep) ...@@ -63,6 +63,7 @@ static void print_pix_fmt_fourccs(enum AVPixelFormat pix_fmt, char sep)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
int i, list_fourcc_pix_fmt = 0, list_pix_fmt_fourccs = 0; int i, list_fourcc_pix_fmt = 0, list_pix_fmt_fourccs = 0;
const PixelFormatTag *pix_fmt_tags = avpriv_get_raw_pix_fmt_tags();
const char *pix_fmt_name = NULL; const char *pix_fmt_name = NULL;
char c; char c;
...@@ -92,10 +93,10 @@ int main(int argc, char **argv) ...@@ -92,10 +93,10 @@ int main(int argc, char **argv)
} }
if (list_fourcc_pix_fmt) { if (list_fourcc_pix_fmt) {
for (i = 0; ff_raw_pix_fmt_tags[i].pix_fmt != AV_PIX_FMT_NONE; i++) { for (i = 0; pix_fmt_tags[i].pix_fmt != AV_PIX_FMT_NONE; i++) {
char buf[32]; char buf[32];
av_get_codec_tag_string(buf, sizeof(buf), ff_raw_pix_fmt_tags[i].fourcc); av_get_codec_tag_string(buf, sizeof(buf), pix_fmt_tags[i].fourcc);
printf("%s: %s\n", buf, av_get_pix_fmt_name(ff_raw_pix_fmt_tags[i].pix_fmt)); printf("%s: %s\n", buf, av_get_pix_fmt_name(pix_fmt_tags[i].pix_fmt));
} }
} }
...@@ -105,7 +106,7 @@ int main(int argc, char **argv) ...@@ -105,7 +106,7 @@ int main(int argc, char **argv)
if (!pix_desc->name || pix_desc->flags & AV_PIX_FMT_FLAG_HWACCEL) if (!pix_desc->name || pix_desc->flags & AV_PIX_FMT_FLAG_HWACCEL)
continue; continue;
printf("%s: ", pix_desc->name); printf("%s: ", pix_desc->name);
print_pix_fmt_fourccs(i, ' '); print_pix_fmt_fourccs(i, pix_fmt_tags, ' ');
printf("\n"); printf("\n");
} }
} }
...@@ -116,7 +117,7 @@ int main(int argc, char **argv) ...@@ -116,7 +117,7 @@ int main(int argc, char **argv)
fprintf(stderr, "Invalid pixel format selected '%s'\n", pix_fmt_name); fprintf(stderr, "Invalid pixel format selected '%s'\n", pix_fmt_name);
return 1; return 1;
} }
print_pix_fmt_fourccs(pix_fmt, '\n'); print_pix_fmt_fourccs(pix_fmt, pix_fmt_tags, '\n');
} }
return 0; return 0;
......
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