summaryrefslogtreecommitdiffstats
path: root/libavdevice
diff options
context:
space:
mode:
authorAndrey Utkin <andrey.utkin@corp.bluecherry.net>2014-11-05 16:38:30 +0400
committerMichael Niedermayer <michaelni@gmx.at>2014-11-05 19:15:14 +0100
commit4fd70679877b71fd624b02bc35b145065591e638 (patch)
treeb0fd7dcaa96844c1885524bafeb5287f638ec6d4 /libavdevice
parenta604de4fd89e8fe37d2f8163282060fcaa64ee3e (diff)
downloadffmpeg-streaming-4fd70679877b71fd624b02bc35b145065591e638.zip
ffmpeg-streaming-4fd70679877b71fd624b02bc35b145065591e638.tar.gz
v4l2: support MPEG4 compressed streams
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice')
-rw-r--r--libavdevice/v4l2-common.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavdevice/v4l2-common.c b/libavdevice/v4l2-common.c
index 966b9a1..196c09b 100644
--- a/libavdevice/v4l2-common.c
+++ b/libavdevice/v4l2-common.c
@@ -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
OpenPOWER on IntegriCloud