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
5cd947d8
Commit
5cd947d8
authored
May 28, 2012
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix r10k codec for widths that are not multiples of 64.
Fixes ticket #1358
parent
77cea13f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
r210dec.c
libavcodec/r210dec.c
+2
-1
r210enc.c
libavcodec/r210enc.c
+2
-1
No files found.
libavcodec/r210dec.c
View file @
5cd947d8
...
...
@@ -41,7 +41,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
int
h
,
w
;
AVFrame
*
pic
=
avctx
->
coded_frame
;
const
uint32_t
*
src
=
(
const
uint32_t
*
)
avpkt
->
data
;
int
aligned_width
=
FFALIGN
(
avctx
->
width
,
64
);
int
aligned_width
=
FFALIGN
(
avctx
->
width
,
avctx
->
codec_id
==
CODEC_ID_R10K
?
1
:
64
);
uint8_t
*
dst_line
;
if
(
pic
->
data
[
0
])
...
...
libavcodec/r210enc.c
View file @
5cd947d8
...
...
@@ -38,7 +38,8 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
const
AVFrame
*
pic
,
int
*
got_packet
)
{
int
i
,
j
,
ret
;
int
aligned_width
=
FFALIGN
(
avctx
->
width
,
64
);
int
aligned_width
=
FFALIGN
(
avctx
->
width
,
avctx
->
codec_id
==
CODEC_ID_R10K
?
1
:
64
);
int
pad
=
(
aligned_width
-
avctx
->
width
)
*
4
;
uint8_t
*
src_line
;
uint8_t
*
dst
;
...
...
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