videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

v4l2: Add support for h264

This commit is contained in:
Luca Barbato 2015-02-27 01:34:52 +01:00
parent 619d5e7db8
commit 9a26ba9713
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavdevice/v4l2.c
View File

@ -111,6 +111,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
};
static int device_open(AVFormatContext *ctx)
@ -782,8 +785,10 @@ static int v4l2_read_header(AVFormatContext *s1)
if (s->pixel_format) {
AVCodec *codec = avcodec_find_decoder_by_name(s->pixel_format);
if (codec)
if (codec) {
s1->video_codec_id = codec->id;
st->need_parsing = AVSTREAM_PARSE_HEADERS;
}
pix_fmt = av_get_pix_fmt(s->pixel_format);