diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2012-12-21 18:12:29 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2012-12-21 18:12:29 +0100 |
| commit | 0fb79f30db138e3686fbfcf88ba58ea7c1e61bfc (patch) | |
| tree | 878f420770fbb02523e518903f9f8102330c7875 | |
| parent | 1b598e6776187040c6d54cfd28eb7a49e91756e2 (diff) | |
| download | ffmpeg-0fb79f30db138e3686fbfcf88ba58ea7c1e61bfc.tar.gz | |
Support H264 over video4linux2.
Tested-by: Val Malykh
| -rw-r--r-- | libavdevice/v4l2.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index cd6aeb225a..b2e5fed27d 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 |