aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2013-09-01 20:20:47 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2013-09-05 22:55:33 +0200
commit06a927a6b5343b1cff5d09a0c4d525adbfea901c (patch)
treea7a2afc58a5cfa94616a850785e34e7d16c69aea
parent3c523bdda84f8d2036b017fc82a428f064e4d1c0 (diff)
downloadffmpeg-06a927a6b5343b1cff5d09a0c4d525adbfea901c.tar.gz
Read h264 headers from v4l2 to allow stream-copying.
Fixes ticket #2882. Analyzed and tested by William C Bonner. (cherry picked from commit e337c9d56408dc00a15887309488a1ff5cb06ba3)
-rw-r--r--libavdevice/v4l2.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index 6726b0b89f..049f0bd93c 100644
--- a/libavdevice/v4l2.c
+++ b/libavdevice/v4l2.c
@@ -985,6 +985,9 @@ static int v4l2_read_header(AVFormatContext *s1)
if (codec_id == AV_CODEC_ID_RAWVIDEO)
st->codec->codec_tag =
avcodec_pix_fmt_to_codec_tag(st->codec->pix_fmt);
+ else if (codec_id == AV_CODEC_ID_H264) {
+ st->need_parsing = AVSTREAM_PARSE_HEADERS;
+ }
if (desired_format == V4L2_PIX_FMT_YVU420)
st->codec->codec_tag = MKTAG('Y', 'V', '1', '2');
else if (desired_format == V4L2_PIX_FMT_YVU410)