OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
96f9fbe
)
h264: informative error reporting in decode_slice_header()
author
Luca Barbato
<lu_zero@gentoo.org>
Tue, 18 Feb 2014 22:47:55 +0000
(23:47 +0100)
committer
Vittorio Giovara
<vittorio.giovara@gmail.com>
Tue, 18 Feb 2014 22:47:55 +0000
(23:47 +0100)
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
libavcodec/h264.c
patch
|
blob
|
history
diff --git
a/libavcodec/h264.c
b/libavcodec/h264.c
index
3f99109
..
9cc32e9
100644
(file)
--- a/
libavcodec/h264.c
+++ b/
libavcodec/h264.c
@@
-3471,8
+3471,12
@@
static int decode_slice_header(H264Context *h, H264Context *h0)
h->height != h->avctx->coded_height ||
needs_reinit)) {
if (h != h0) {
- av_log(h->avctx, AV_LOG_ERROR, "changing width/height on "
- "slice %d\n", h0->current_slice + 1);
+ av_log(h->avctx, AV_LOG_ERROR,
+ "changing width %d -> %d / height %d -> %d on "
+ "slice %d\n",
+ h->width, h->avctx->coded_width,
+ h->height, h->avctx->coded_height,
+ h0->current_slice + 1);
return AVERROR_INVALIDDATA;
}