Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
9a26ba97
Commit
9a26ba97
authored
Feb 27, 2015
by
Luca Barbato
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
v4l2: Add support for h264
parent
619d5e7d
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletion
+6
-1
v4l2.c
libavdevice/v4l2.c
+6
-1
No files found.
libavdevice/v4l2.c
View file @
9a26ba97
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment