diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-28 10:14:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-28 10:14:16 +0200 |
| commit | 16310e36d9405b8d7d0da1273b03bec3adfec153 (patch) | |
| tree | c7dde9eefbdf26af21e462868c91ec0e97644017 /libavcodec | |
| parent | 831e749bc926db2aea5f999529e176d18c832c82 (diff) | |
| parent | 41f3c60fbb7420f41295c8e0cf80acf9e71f72d0 (diff) | |
| download | ffmpeg-16310e36d9405b8d7d0da1273b03bec3adfec153.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Avoid a null pointer dereference in avcodec_decode_video2().
Set block_align when reading QDM2 in mov.
Fix muxing QDM2 mono into caf.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/utils.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 9fe3a16db7..e0819f4515 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1920,6 +1920,8 @@ int attribute_align_arg avcodec_decode_video2(AVCodecContext *avctx, AVFrame *pi // copy to ensure we do not change avpkt AVPacket tmp = *avpkt; + if (!avctx->codec) + return AVERROR(EINVAL); if (avctx->codec->type != AVMEDIA_TYPE_VIDEO) { av_log(avctx, AV_LOG_ERROR, "Invalid media type for video\n"); return AVERROR(EINVAL); |