[FFmpeg-cvslog] v4l2: support MPEG4 compressed streams

[Andrey Utkin]

ffmpeg | branch: master | Andrey Utkin <andrey.utkin at corp.bluecherry.net> | Wed Nov  5 16:38:30 2014 +0400| [4fd70679877b71fd624b02bc35b145065591e638] | committer: Michael Niedermayer

v4l2: support MPEG4 compressed streams

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4fd70679877b71fd624b02bc35b145065591e638
---

 libavdevice/v4l2-common.c |    3 +++
 1 file changed, 3 insertions(+)

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