diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-07 02:10:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-07 02:44:14 +0100 |
| commit | 3393cd85459cb9c23dec90373da91559987000ee (patch) | |
| tree | bff6d76e0cfa6e3f66f9ab1b3253ee28a7a68159 /libavcodec/utils.c | |
| parent | 74080ded9630f9492d9a382815502c141c146900 (diff) | |
| download | ffmpeg-3393cd85459cb9c23dec90373da91559987000ee.tar.gz | |
avcodec/utils: check AVframe.format being set in avcodec_encode_video2()
We dont fail hard if its not set as the old API allowed this and our examples
did in the distant past not set it, these examples still work with the
current code and some encoders.
Based on suggestion by: funman
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 66fe62cc85..a75fe1a80e 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -2088,6 +2088,9 @@ int attribute_align_arg avcodec_encode_video2(AVCodecContext *avctx, if (av_image_check_size(avctx->width, avctx->height, 0, avctx)) return AVERROR(EINVAL); + if (frame && frame->format == AV_PIX_FMT_NONE) + av_log(avctx, AV_LOG_WARNING, "AVFrame.format is not set\n"); + av_assert0(avctx->codec->encode2); ret = avctx->codec->encode2(avctx, avpkt, frame, got_packet_ptr); |