[FFmpeg-devel] [PATCH] lavc/utils: extend feedback provided by avcodec_open2()

Stefano Sabatini stefasab at gmail.com
Wed Oct 17 12:33:51 CEST 2012


On date Monday 2012-10-15 15:37:38 +0200, Stefano Sabatini encoded:
> ---
>  libavcodec/utils.c |   30 ++++++++++++++++++++++--------
>  1 files changed, 22 insertions(+), 8 deletions(-)
> 
> diff --git a/libavcodec/utils.c b/libavcodec/utils.c
> index d64de0e..a7d2bc7 100644
> --- a/libavcodec/utils.c
> +++ b/libavcodec/utils.c
> @@ -960,7 +960,8 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code
>                  }
>              }
>              if (avctx->codec->sample_fmts[i] == AV_SAMPLE_FMT_NONE) {
> -                av_log(avctx, AV_LOG_ERROR, "Specified sample_fmt is not supported.\n");
> +                av_log(avctx, AV_LOG_ERROR, "Specified sample format '%s' is not supported\n",
> +                       av_get_sample_fmt_name(avctx->sample_fmt));
>                  ret = AVERROR(EINVAL);
>                  goto free_and_end;
>              }
> @@ -972,7 +973,8 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code
>              if (avctx->codec->pix_fmts[i] == AV_PIX_FMT_NONE
>                  && !((avctx->codec_id == AV_CODEC_ID_MJPEG || avctx->codec_id == AV_CODEC_ID_LJPEG)
>                       && avctx->strict_std_compliance <= FF_COMPLIANCE_UNOFFICIAL)) {
> -                av_log(avctx, AV_LOG_ERROR, "Specified pix_fmt is not supported\n");
> +                av_log(avctx, AV_LOG_ERROR, "Specified pixel format '%s' is not supported\n",
> +                       av_get_pix_fmt_name(avctx->pix_fmt));
>                  ret = AVERROR(EINVAL);
>                  goto free_and_end;

Updated in order to avoid null printing in case of invalid
pix/sample_fmt.

Will push it soon if I read no comments.
-- 
FFmpeg = Faithful and Fanciful Merciful Picky Empowered Gospel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-lavc-utils-extend-feedback-provided-by-avcodec_open2.patch
Type: text/x-diff
Size: 5805 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20121017/f6576fac/attachment.bin>


More information about the ffmpeg-devel mailing list