aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/raw.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2014-04-11 23:35:11 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2014-04-11 23:35:11 +0200
commit8b122937af9ad10e9352f69c712e782fd6cfb436 (patch)
tree3b9824d4de2fc16976ac65f164cd22a581e1c8a2 /libavcodec/raw.c
parent662a8d882758ac90cf55968fc7ab3540e51f2d0b (diff)
downloadffmpeg-8b122937af9ad10e9352f69c712e782fd6cfb436.tar.gz
Warn if rawvideo and an unreadable pix_fmt are written.
Print an error if a combination of rawvideo and an unusual pix_fmt that will be impossible to decode are written to avi or mov. Fixes ticket #3545.
Diffstat (limited to 'libavcodec/raw.c')
-rw-r--r--libavcodec/raw.c25
1 files changed, 25 insertions, 0 deletions
diff --git a/libavcodec/raw.c b/libavcodec/raw.c
index 16b1b39945..551a1722fc 100644
--- a/libavcodec/raw.c
+++ b/libavcodec/raw.c
@@ -234,3 +234,28 @@ unsigned int avcodec_pix_fmt_to_codec_tag(enum AVPixelFormat fmt)
}
return 0;
}
+
+const PixelFormatTag avpriv_pix_fmt_bps_avi[] = {
+ { AV_PIX_FMT_MONOWHITE, 1 },
+ { AV_PIX_FMT_PAL8, 2 },
+ { AV_PIX_FMT_PAL8, 4 },
+ { AV_PIX_FMT_PAL8, 8 },
+ { AV_PIX_FMT_RGB444LE, 12 },
+ { AV_PIX_FMT_RGB555LE, 15 },
+ { AV_PIX_FMT_RGB555LE, 16 },
+ { AV_PIX_FMT_BGR24, 24 },
+ { AV_PIX_FMT_BGRA, 32 },
+ { AV_PIX_FMT_NONE, 0 },
+};
+
+const PixelFormatTag avpriv_pix_fmt_bps_mov[] = {
+ { AV_PIX_FMT_MONOWHITE, 1 },
+ { AV_PIX_FMT_PAL8, 2 },
+ { AV_PIX_FMT_PAL8, 4 },
+ { AV_PIX_FMT_PAL8, 8 },
+ { AV_PIX_FMT_RGB555BE, 16 },
+ { AV_PIX_FMT_RGB24, 24 },
+ { AV_PIX_FMT_ARGB, 32 },
+ { AV_PIX_FMT_MONOWHITE,33 },
+ { AV_PIX_FMT_NONE, 0 },
+};