Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
30015305
Commit
30015305
authored
Dec 16, 2015
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use avpriv_request_sample() where appropriate
parent
07cac07c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
13 deletions
+4
-13
flicvideo.c
libavcodec/flicvideo.c
+3
-11
roqvideodec.c
libavcodec/roqvideodec.c
+1
-2
No files found.
libavcodec/flicvideo.c
View file @
30015305
...
...
@@ -116,7 +116,7 @@ static av_cold int flic_decode_init(AVCodecContext *avctx)
case
15
:
avctx
->
pix_fmt
=
AV_PIX_FMT_RGB555
;
break
;
case
16
:
avctx
->
pix_fmt
=
AV_PIX_FMT_RGB565
;
break
;
case
24
:
avctx
->
pix_fmt
=
AV_PIX_FMT_BGR24
;
/* Supposedly BGR, but no files to test with */
av
_log
(
avctx
,
AV_LOG_ERROR
,
"24Bpp FLC/FLX is unsupported due to no test files.
\n
"
);
av
priv_request_sample
(
avctx
,
"24bpp FLC/FLX
"
);
return
AVERROR_PATCHWELCOME
;
default
:
av_log
(
avctx
,
AV_LOG_ERROR
,
"Unknown FLC/FLX depth of %d Bpp is unsupported.
\n
"
,
depth
);
...
...
@@ -695,14 +695,6 @@ static int flic_decode_frame_15_16BPP(AVCodecContext *avctx,
return
buf_size
;
}
static
int
flic_decode_frame_24BPP
(
AVCodecContext
*
avctx
,
void
*
data
,
int
*
got_frame
,
const
uint8_t
*
buf
,
int
buf_size
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"24Bpp FLC Unsupported due to lack of test files.
\n
"
);
return
AVERROR_PATCHWELCOME
;
}
static
int
flic_decode_frame
(
AVCodecContext
*
avctx
,
void
*
data
,
int
*
got_frame
,
AVPacket
*
avpkt
)
...
...
@@ -719,8 +711,8 @@ static int flic_decode_frame(AVCodecContext *avctx,
buf
,
buf_size
);
}
else
if
(
avctx
->
pix_fmt
==
AV_PIX_FMT_BGR24
)
{
return
flic_decode_frame_24BPP
(
avctx
,
data
,
got_frame
,
buf
,
buf_size
)
;
avpriv_request_sample
(
avctx
,
"24bpp FLC"
);
return
AVERROR_PATCHWELCOME
;
}
/* Should not get here, ever as the pix_fmt is processed */
...
...
libavcodec/roqvideodec.c
View file @
30015305
...
...
@@ -164,8 +164,7 @@ static av_cold int roq_decode_init(AVCodecContext *avctx)
s
->
avctx
=
avctx
;
if
(
avctx
->
width
%
16
||
avctx
->
height
%
16
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"Dimensions must be a multiple of 16
\n
"
);
avpriv_request_sample
(
avctx
,
"Dimensions not being a multiple of 16"
);
return
AVERROR_PATCHWELCOME
;
}
...
...
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