[FFmpeg-cvslog] Support H264 over video4linux2.

Carl Eugen Hoyos git at videolan.org
Fri Dec 21 18:13:26 CET 2012


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Fri Dec 21 18:12:29 2012 +0100| [0fb79f30db138e3686fbfcf88ba58ea7c1e61bfc] | committer: Carl Eugen Hoyos

Support H264 over video4linux2.

Tested-by: Val Malykh

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

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

diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index cd6aeb2..b2e5fed 100644
--- a/libavdevice/v4l2.c
+++ b/libavdevice/v4l2.c
@@ -150,6 +150,9 @@ static struct fmt_map fmt_conversion_table[] = {
     { AV_PIX_FMT_NV12,    AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_NV12    },
     { AV_PIX_FMT_NONE,    AV_CODEC_ID_MJPEG,    V4L2_PIX_FMT_MJPEG   },
     { AV_PIX_FMT_NONE,    AV_CODEC_ID_MJPEG,    V4L2_PIX_FMT_JPEG    },
+#ifdef V4L2_PIX_FMT_H264
+    { AV_PIX_FMT_NONE,    AV_CODEC_ID_H264,     V4L2_PIX_FMT_H264    },
+#endif
 #ifdef V4L2_PIX_FMT_CPIA1
     { AV_PIX_FMT_NONE,    AV_CODEC_ID_CPIA,     V4L2_PIX_FMT_CPIA1   },
 #endif



More information about the ffmpeg-cvslog mailing list