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
70fb031c
Commit
70fb031c
authored
Apr 21, 2011
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use av_log_ask_for_sample() where appropriate.
parent
8d67218b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
11 deletions
+12
-11
cook.c
libavcodec/cook.c
+6
-6
truemotion1.c
libavcodec/truemotion1.c
+2
-2
tta.c
libavcodec/tta.c
+3
-2
v210x.c
libavcodec/v210x.c
+1
-1
No files found.
libavcodec/cook.c
View file @
70fb031c
...
...
@@ -1136,7 +1136,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
switch
(
q
->
subpacket
[
s
].
cookversion
)
{
case
MONO
:
if
(
q
->
nb_channels
!=
1
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"Container channels != 1, report sample
!
\n
"
);
av_log
_ask_for_sample
(
avctx
,
"Container channels != 1.
!
\n
"
);
return
-
1
;
}
av_log
(
avctx
,
AV_LOG_DEBUG
,
"MONO
\n
"
);
...
...
@@ -1150,7 +1150,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
break
;
case
JOINT_STEREO
:
if
(
q
->
nb_channels
!=
2
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"Container channels != 2, report sample!
\n
"
);
av_log
_ask_for_sample
(
avctx
,
"Container channels != 2.
\n
"
);
return
-
1
;
}
av_log
(
avctx
,
AV_LOG_DEBUG
,
"JOINT_STEREO
\n
"
);
...
...
@@ -1188,7 +1188,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
break
;
default
:
av_log
(
avctx
,
AV_LOG_ERROR
,
"Unknown Cook version, report sample!
\n
"
);
av_log
_ask_for_sample
(
avctx
,
"Unknown Cook version.
\n
"
);
return
-
1
;
break
;
}
...
...
@@ -1205,7 +1205,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
/* Try to catch some obviously faulty streams, othervise it might be exploitable */
if
(
q
->
subpacket
[
s
].
total_subbands
>
53
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"total_subbands > 53, report sample!
\n
"
);
av_log
_ask_for_sample
(
avctx
,
"total_subbands > 53
\n
"
);
return
-
1
;
}
...
...
@@ -1215,7 +1215,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
}
if
(
q
->
subpacket
[
s
].
subbands
>
50
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"subbands > 50, report sample!
\n
"
);
av_log
_ask_for_sample
(
avctx
,
"subbands > 50
\n
"
);
return
-
1
;
}
q
->
subpacket
[
s
].
gains1
.
now
=
q
->
subpacket
[
s
].
gain_1
;
...
...
@@ -1226,7 +1226,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
q
->
num_subpackets
++
;
s
++
;
if
(
s
>
MAX_SUBPACKETS
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"Too many subpackets > 5, report file!
\n
"
);
av_log
_ask_for_sample
(
avctx
,
"Too many subpackets > 5
\n
"
);
return
-
1
;
}
}
...
...
libavcodec/truemotion1.c
View file @
70fb031c
...
...
@@ -353,7 +353,7 @@ static int truemotion1_decode_header(TrueMotion1Context *s)
s
->
flags
=
FLAG_KEYFRAME
;
if
(
s
->
flags
&
FLAG_SPRITE
)
{
av_log
(
s
->
avctx
,
AV_LOG_INFO
,
"SPRITE frame found, please report the sample to the developers
\n
"
);
av_log
_ask_for_sample
(
s
->
avctx
,
"SPRITE frame found.
\n
"
);
/* FIXME header.width, height, xoffset and yoffset aren't initialized */
#if 0
s->w = header.width;
...
...
@@ -370,7 +370,7 @@ static int truemotion1_decode_header(TrueMotion1Context *s)
if
((
s
->
w
<
213
)
&&
(
s
->
h
>=
176
))
{
s
->
flags
|=
FLAG_INTERPOLATED
;
av_log
(
s
->
avctx
,
AV_LOG_INFO
,
"INTERPOLATION selected, please report the sample to the developers
\n
"
);
av_log
_ask_for_sample
(
s
->
avctx
,
"INTERPOLATION selected.
\n
"
);
}
}
}
...
...
libavcodec/tta.c
View file @
70fb031c
...
...
@@ -247,7 +247,7 @@ static av_cold int tta_decode_init(AVCodecContext * avctx)
if
(
s
->
is_float
)
{
avctx
->
sample_fmt
=
AV_SAMPLE_FMT_FLT
;
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
"Unsupported sample format. Please contact the developers
.
\n
"
);
av_log
_ask_for_sample
(
s
->
avctx
,
"Unsupported sample format
.
\n
"
);
return
-
1
;
}
else
switch
(
s
->
bps
)
{
...
...
@@ -256,7 +256,8 @@ static av_cold int tta_decode_init(AVCodecContext * avctx)
// case 3: avctx->sample_fmt = AV_SAMPLE_FMT_S24; break;
case
4
:
avctx
->
sample_fmt
=
AV_SAMPLE_FMT_S32
;
break
;
default:
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
"Invalid/unsupported sample format. Please contact the developers.
\n
"
);
av_log_ask_for_sample
(
s
->
avctx
,
"Invalid/unsupported sample format.
\n
"
);
return
-
1
;
}
...
...
libavcodec/v210x.c
View file @
70fb031c
...
...
@@ -52,7 +52,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
}
if
(
avpkt
->
size
>
avctx
->
width
*
avctx
->
height
*
8
/
3
){
av_log
(
avctx
,
AV_LOG_ERROR
,
"Probably padded data, need sample!
\n
"
);
av_log
_ask_for_sample
(
avctx
,
"Probably padded data
\n
"
);
}
pic
->
reference
=
0
;
...
...
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