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
a4472ac0
Commit
a4472ac0
authored
Mar 09, 2013
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add informative messages to av_log_ask_for_sample calls lacking them
parent
8f10f1a6
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
10 deletions
+6
-10
h264.c
libavcodec/h264.c
+2
-3
anm.c
libavformat/anm.c
+1
-1
spdifenc.c
libavformat/spdifenc.c
+1
-2
xwma.c
libavformat/xwma.c
+2
-4
No files found.
libavcodec/h264.c
View file @
a4472ac0
...
@@ -3356,9 +3356,8 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
...
@@ -3356,9 +3356,8 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
h
->
droppable
=
last_pic_droppable
;
h
->
droppable
=
last_pic_droppable
;
return
AVERROR_INVALIDDATA
;
return
AVERROR_INVALIDDATA
;
}
else
if
(
last_pic_droppable
!=
h
->
droppable
)
{
}
else
if
(
last_pic_droppable
!=
h
->
droppable
)
{
av_log
(
h
->
avctx
,
AV_LOG_ERROR
,
av_log_ask_for_sample
(
h
->
avctx
,
"Cannot combine reference and non-reference fields in the same frame
\n
"
);
"Found reference and non-reference fields in the same frame.
\n
"
);
av_log_ask_for_sample
(
h
->
avctx
,
NULL
);
h
->
picture_structure
=
last_pic_structure
;
h
->
picture_structure
=
last_pic_structure
;
h
->
droppable
=
last_pic_droppable
;
h
->
droppable
=
last_pic_droppable
;
return
AVERROR_PATCHWELCOME
;
return
AVERROR_PATCHWELCOME
;
...
...
libavformat/anm.c
View file @
a4472ac0
...
@@ -163,7 +163,7 @@ static int read_header(AVFormatContext *s)
...
@@ -163,7 +163,7 @@ static int read_header(AVFormatContext *s)
return
0
;
return
0
;
invalid:
invalid:
av_log_ask_for_sample
(
s
,
NULL
);
av_log_ask_for_sample
(
s
,
"Invalid header element encountered.
\n
"
);
return
AVERROR_PATCHWELCOME
;
return
AVERROR_PATCHWELCOME
;
}
}
...
...
libavformat/spdifenc.c
View file @
a4472ac0
...
@@ -412,8 +412,7 @@ static int spdif_header_truehd(AVFormatContext *s, AVPacket *pkt)
...
@@ -412,8 +412,7 @@ static int spdif_header_truehd(AVFormatContext *s, AVPacket *pkt)
if
(
pkt
->
size
>
TRUEHD_FRAME_OFFSET
-
mat_code_length
)
{
if
(
pkt
->
size
>
TRUEHD_FRAME_OFFSET
-
mat_code_length
)
{
/* if such frames exist, we'd need some more complex logic to
/* if such frames exist, we'd need some more complex logic to
* distribute the TrueHD frames in the MAT frame */
* distribute the TrueHD frames in the MAT frame */
av_log
(
s
,
AV_LOG_ERROR
,
"TrueHD frame too big, %d bytes
\n
"
,
pkt
->
size
);
av_log_ask_for_sample
(
s
,
"TrueHD frame too big, %d bytes
\n
"
,
pkt
->
size
);
av_log_ask_for_sample
(
s
,
NULL
);
return
AVERROR_PATCHWELCOME
;
return
AVERROR_PATCHWELCOME
;
}
}
...
...
libavformat/xwma.c
View file @
a4472ac0
...
@@ -85,9 +85,8 @@ static int xwma_read_header(AVFormatContext *s)
...
@@ -85,9 +85,8 @@ static int xwma_read_header(AVFormatContext *s)
* anyway.
* anyway.
*/
*/
if
(
st
->
codec
->
codec_id
!=
AV_CODEC_ID_WMAV2
)
{
if
(
st
->
codec
->
codec_id
!=
AV_CODEC_ID_WMAV2
)
{
av_log
(
s
,
AV_LOG_WARNING
,
"unexpected codec (tag 0x04%x; id %d)
\n
"
,
av_log
_ask_for_sample
(
s
,
"unexpected codec (tag 0x04%x; id %d)
\n
"
,
st
->
codec
->
codec_tag
,
st
->
codec
->
codec_id
);
st
->
codec
->
codec_tag
,
st
->
codec
->
codec_id
);
av_log_ask_for_sample
(
s
,
NULL
);
}
else
{
}
else
{
/* In all xWMA files I have seen, there is no extradata. But the WMA
/* In all xWMA files I have seen, there is no extradata. But the WMA
* codecs require extradata, so we provide our own fake extradata.
* codecs require extradata, so we provide our own fake extradata.
...
@@ -101,9 +100,8 @@ static int xwma_read_header(AVFormatContext *s)
...
@@ -101,9 +100,8 @@ static int xwma_read_header(AVFormatContext *s)
* if it will work, but just go on and try it, after asking
* if it will work, but just go on and try it, after asking
* the user for a sample.
* the user for a sample.
*/
*/
av_log
(
s
,
AV_LOG_WARNING
,
"unexpected extradata (%d bytes)
\n
"
,
av_log
_ask_for_sample
(
s
,
"unexpected extradata (%d bytes)
\n
"
,
st
->
codec
->
extradata_size
);
st
->
codec
->
extradata_size
);
av_log_ask_for_sample
(
s
,
NULL
);
}
else
{
}
else
{
st
->
codec
->
extradata_size
=
6
;
st
->
codec
->
extradata_size
=
6
;
st
->
codec
->
extradata
=
av_mallocz
(
6
+
FF_INPUT_BUFFER_PADDING_SIZE
);
st
->
codec
->
extradata
=
av_mallocz
(
6
+
FF_INPUT_BUFFER_PADDING_SIZE
);
...
...
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