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
f8ce1e82
Commit
f8ce1e82
authored
Jul 27, 2016
by
Clément Bœsch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc/h264_slice: adjust a few line breaks to reduce diff with Libav
parent
78c7197e
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
4 deletions
+1
-4
h264_slice.c
libavcodec/h264_slice.c
+1
-4
No files found.
libavcodec/h264_slice.c
View file @
f8ce1e82
...
@@ -374,6 +374,7 @@ int ff_h264_update_thread_context(AVCodecContext *dst,
...
@@ -374,6 +374,7 @@ int ff_h264_update_thread_context(AVCodecContext *dst,
return
err
;
return
err
;
}
}
}
}
/* copy block_offset since frame_start may not be called */
/* copy block_offset since frame_start may not be called */
memcpy
(
h
->
block_offset
,
h1
->
block_offset
,
sizeof
(
h
->
block_offset
));
memcpy
(
h
->
block_offset
,
h1
->
block_offset
,
sizeof
(
h
->
block_offset
));
}
}
...
@@ -1380,7 +1381,6 @@ static int h264_slice_header_parse(H264Context *h, H264SliceContext *sl,
...
@@ -1380,7 +1381,6 @@ static int h264_slice_header_parse(H264Context *h, H264SliceContext *sl,
sl
->
pps_id
);
sl
->
pps_id
);
return
AVERROR_INVALIDDATA
;
return
AVERROR_INVALIDDATA
;
}
}
pps
=
(
const
PPS
*
)
h
->
ps
.
pps_list
[
sl
->
pps_id
]
->
data
;
pps
=
(
const
PPS
*
)
h
->
ps
.
pps_list
[
sl
->
pps_id
]
->
data
;
if
(
!
h
->
ps
.
sps_list
[
pps
->
sps_id
])
{
if
(
!
h
->
ps
.
sps_list
[
pps
->
sps_id
])
{
...
@@ -1388,7 +1388,6 @@ static int h264_slice_header_parse(H264Context *h, H264SliceContext *sl,
...
@@ -1388,7 +1388,6 @@ static int h264_slice_header_parse(H264Context *h, H264SliceContext *sl,
"non-existing SPS %u referenced
\n
"
,
pps
->
sps_id
);
"non-existing SPS %u referenced
\n
"
,
pps
->
sps_id
);
return
AVERROR_INVALIDDATA
;
return
AVERROR_INVALIDDATA
;
}
}
sps
=
(
const
SPS
*
)
h
->
ps
.
sps_list
[
pps
->
sps_id
]
->
data
;
sps
=
(
const
SPS
*
)
h
->
ps
.
sps_list
[
pps
->
sps_id
]
->
data
;
frame_num
=
get_bits
(
&
sl
->
gb
,
sps
->
log2_max_frame_num
);
frame_num
=
get_bits
(
&
sl
->
gb
,
sps
->
log2_max_frame_num
);
...
@@ -1413,7 +1412,6 @@ static int h264_slice_header_parse(H264Context *h, H264SliceContext *sl,
...
@@ -1413,7 +1412,6 @@ static int h264_slice_header_parse(H264Context *h, H264SliceContext *sl,
return
-
1
;
return
-
1
;
}
}
field_pic_flag
=
get_bits1
(
&
sl
->
gb
);
field_pic_flag
=
get_bits1
(
&
sl
->
gb
);
if
(
field_pic_flag
)
{
if
(
field_pic_flag
)
{
bottom_field_flag
=
get_bits1
(
&
sl
->
gb
);
bottom_field_flag
=
get_bits1
(
&
sl
->
gb
);
picture_structure
=
PICT_TOP_FIELD
+
bottom_field_flag
;
picture_structure
=
PICT_TOP_FIELD
+
bottom_field_flag
;
...
@@ -1421,7 +1419,6 @@ static int h264_slice_header_parse(H264Context *h, H264SliceContext *sl,
...
@@ -1421,7 +1419,6 @@ static int h264_slice_header_parse(H264Context *h, H264SliceContext *sl,
picture_structure
=
PICT_FRAME
;
picture_structure
=
PICT_FRAME
;
}
}
}
}
sl
->
picture_structure
=
picture_structure
;
sl
->
picture_structure
=
picture_structure
;
sl
->
mb_field_decoding_flag
=
picture_structure
!=
PICT_FRAME
;
sl
->
mb_field_decoding_flag
=
picture_structure
!=
PICT_FRAME
;
...
...
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