]> git.sesse.net Git - ffmpeg/commitdiff
v4l2: support MPEG4 compressed streams
authorAndrey Utkin <andrey.utkin@corp.bluecherry.net>
Wed, 5 Nov 2014 12:38:30 +0000 (16:38 +0400)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Nov 2014 18:15:14 +0000 (19:15 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavdevice/v4l2-common.c

index 966b9a15795d1d6b812b2ea4522c78cdf7aa90be..196c09b7fc85a65fe76231a01ffe523c116d0eac 100644 (file)
@@ -46,6 +46,9 @@ const struct fmt_map ff_fmt_conversion_table[] = {
 #ifdef V4L2_PIX_FMT_H264
     { AV_PIX_FMT_NONE,    AV_CODEC_ID_H264,     V4L2_PIX_FMT_H264    },
 #endif
+#ifdef V4L2_PIX_FMT_MPEG4
+    { AV_PIX_FMT_NONE,    AV_CODEC_ID_MPEG4,    V4L2_PIX_FMT_MPEG4   },
+#endif
 #ifdef V4L2_PIX_FMT_CPIA1
     { AV_PIX_FMT_NONE,    AV_CODEC_ID_CPIA,     V4L2_PIX_FMT_CPIA1   },
 #endif