summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-06-30 20:43:18 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-06-30 20:44:01 +0200
commit7001eee1f4bda539c449d191116af8a0ec88ee50 (patch)
treeca17bff5f8b20acdd209028680bbf3ecdb99c70f
parent5968a076222ab892b3a657e51f14969e57d92646 (diff)
downloadffmpeg-streaming-7001eee1f4bda539c449d191116af8a0ec88ee50.zip
ffmpeg-streaming-7001eee1f4bda539c449d191116af8a0ec88ee50.tar.gz
avcodec_encode_audio2: print error messages for errors
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/utils.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index f7a34af..c2ccd8f 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1103,8 +1103,10 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx,
/* check for valid frame size */
if (frame) {
if (avctx->codec->capabilities & CODEC_CAP_SMALL_LAST_FRAME) {
- if (frame->nb_samples > avctx->frame_size)
+ if (frame->nb_samples > avctx->frame_size) {
+ av_log(avctx, AV_LOG_ERROR, "more samples than frame size (avcodec_encode_audio2)\n");
return AVERROR(EINVAL);
+ }
} else if (!(avctx->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE)) {
if (frame->nb_samples < avctx->frame_size &&
!avctx->internal->last_audio_frame) {
@@ -1116,8 +1118,10 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx,
avctx->internal->last_audio_frame = 1;
}
- if (frame->nb_samples != avctx->frame_size)
+ if (frame->nb_samples != avctx->frame_size) {
+ av_log(avctx, AV_LOG_ERROR, "nb_samples (%d) != frame_size (%d) (avcodec_encode_audio2)\n", frame->nb_samples, avctx->frame_size);
return AVERROR(EINVAL);
+ }
}
}
OpenPOWER on IntegriCloud