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
a8cb567e
Commit
a8cb567e
authored
Dec 03, 2016
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc: Remove CR/LF from avpriv_request_sample() calls.
parent
6c15618b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
aacdec_template.c
libavcodec/aacdec_template.c
+1
-1
dnxhddec.c
libavcodec/dnxhddec.c
+1
-1
m101.c
libavcodec/m101.c
+2
-2
svq3.c
libavcodec/svq3.c
+1
-1
No files found.
libavcodec/aacdec_template.c
View file @
a8cb567e
...
@@ -452,7 +452,7 @@ static int output_configure(AACContext *ac,
...
@@ -452,7 +452,7 @@ static int output_configure(AACContext *ac,
int
id
=
layout_map
[
i
][
1
];
int
id
=
layout_map
[
i
][
1
];
id_map
[
type
][
id
]
=
type_counts
[
type
]
++
;
id_map
[
type
][
id
]
=
type_counts
[
type
]
++
;
if
(
id_map
[
type
][
id
]
>=
MAX_ELEM_ID
)
{
if
(
id_map
[
type
][
id
]
>=
MAX_ELEM_ID
)
{
avpriv_request_sample
(
ac
->
avctx
,
"
Remapped id too large
\n
"
);
avpriv_request_sample
(
ac
->
avctx
,
"
Too large remapped id
"
);
return
AVERROR_PATCHWELCOME
;
return
AVERROR_PATCHWELCOME
;
}
}
}
}
...
...
libavcodec/dnxhddec.c
View file @
a8cb567e
...
@@ -234,7 +234,7 @@ static int dnxhd_decode_header(DNXHDContext *ctx, AVFrame *frame,
...
@@ -234,7 +234,7 @@ static int dnxhd_decode_header(DNXHDContext *ctx, AVFrame *frame,
ctx
->
is_444
=
(
buf
[
0x2C
]
>>
6
)
&
1
;
ctx
->
is_444
=
(
buf
[
0x2C
]
>>
6
)
&
1
;
if
(
ctx
->
is_444
)
{
if
(
ctx
->
is_444
)
{
if
(
bitdepth
==
8
)
{
if
(
bitdepth
==
8
)
{
avpriv_request_sample
(
ctx
->
avctx
,
"4:4:4 8 bits
\n
"
);
avpriv_request_sample
(
ctx
->
avctx
,
"4:4:4 8 bits"
);
return
AVERROR_INVALIDDATA
;
return
AVERROR_INVALIDDATA
;
}
else
if
(
bitdepth
==
10
)
{
}
else
if
(
bitdepth
==
10
)
{
ctx
->
decode_dct_block
=
dnxhd_decode_dct_block_10_444
;
ctx
->
decode_dct_block
=
dnxhd_decode_dct_block_10_444
;
...
...
libavcodec/m101.c
View file @
a8cb567e
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
static
av_cold
int
m101_decode_init
(
AVCodecContext
*
avctx
)
static
av_cold
int
m101_decode_init
(
AVCodecContext
*
avctx
)
{
{
if
(
avctx
->
extradata_size
<
6
*
4
)
{
if
(
avctx
->
extradata_size
<
6
*
4
)
{
avpriv_request_sample
(
avctx
,
"Missing or too small extradata (size %d)
\n
"
,
avctx
->
extradata_size
);
avpriv_request_sample
(
avctx
,
"Missing or too small extradata (size %d)"
,
avctx
->
extradata_size
);
return
AVERROR_INVALIDDATA
;
return
AVERROR_INVALIDDATA
;
}
}
...
@@ -36,7 +36,7 @@ static av_cold int m101_decode_init(AVCodecContext *avctx)
...
@@ -36,7 +36,7 @@ static av_cold int m101_decode_init(AVCodecContext *avctx)
else
if
(
avctx
->
extradata
[
2
*
4
]
==
8
)
{
else
if
(
avctx
->
extradata
[
2
*
4
]
==
8
)
{
avctx
->
pix_fmt
=
AV_PIX_FMT_YUYV422
;
avctx
->
pix_fmt
=
AV_PIX_FMT_YUYV422
;
}
else
{
}
else
{
avpriv_request_sample
(
avctx
,
"BPS %d
\n
"
,
avctx
->
extradata
[
2
*
4
]);
avpriv_request_sample
(
avctx
,
"BPS %d"
,
avctx
->
extradata
[
2
*
4
]);
return
AVERROR_INVALIDDATA
;
return
AVERROR_INVALIDDATA
;
}
}
...
...
libavcodec/svq3.c
View file @
a8cb567e
...
@@ -1556,7 +1556,7 @@ static int svq3_decode_frame(AVCodecContext *avctx, void *data,
...
@@ -1556,7 +1556,7 @@ static int svq3_decode_frame(AVCodecContext *avctx, void *data,
return
-
1
;
return
-
1
;
}
}
if
(
s
->
slice_type
!=
s
->
pict_type
)
{
if
(
s
->
slice_type
!=
s
->
pict_type
)
{
avpriv_request_sample
(
avctx
,
"non constant slice type
\n
"
);
avpriv_request_sample
(
avctx
,
"non constant slice type"
);
}
}
/* TODO: support s->mb_skip_run */
/* TODO: support s->mb_skip_run */
}
}
...
...
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