diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-16 18:55:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-03 19:02:32 +0100 |
| commit | 5341734b03a178d6eef66ec9d6caabdebe8164ae (patch) | |
| tree | 0892419eb51bbb3c74ea413a20bd3ce67ff88ba0 | |
| parent | 3c7ba39d092c3318edc536b31bb3a47a0227ef4e (diff) | |
| download | ffmpeg-5341734b03a178d6eef66ec9d6caabdebe8164ae.tar.gz | |
h264: return the consumed amountg in case of Q264
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3d07e0aba0c9c29ed17a1becfae61b8b58f46cd1)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index fa95d7035f..e86a622328 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -4114,7 +4114,7 @@ not_extra: if(!(s->flags2 & CODEC_FLAG2_CHUNKS) && !s->current_picture_ptr){ if (avctx->skip_frame >= AVDISCARD_NONREF || buf_size >= 4 && !memcmp("Q264", buf, 4)) - return 0; + return buf_size; av_log(avctx, AV_LOG_ERROR, "no frame!\n"); return -1; } |