Merge remote-tracking branch 'qatar/master'
* qatar/master: vc1: use an enum for Frame Coding Mode doc: cleanup filter section indeo3: error out if no motion vector is set. x86inc: Flag shufps as an floating-point instruction for the AVX emulation code. mpegaudio: do not use init_static_data() for initializing tables. musepack: fix signed shift overflow in mpc_read_packet() mov: Make format string match variable type. wmavoice: Make format string match variable type. vc1: select interlaced scan table by FCM element Generalize RIFF INFO tag support; support reading INFO tag in wav pthread: track thread existence in a separate variable. Conflicts: doc/filters.texi libavcodec/pthread.c libavformat/avi.c libavformat/riff.c libavformat/riff.h libavformat/wav.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
@@ -759,6 +759,8 @@ static int parse_bintree(Indeo3DecodeContext *ctx, AVCodecContext *avctx,
|
||||
av_log(avctx, AV_LOG_ERROR, "SkipCell procedure not implemented yet!\n");
|
||||
|
||||
CHECK_CELL
|
||||
if(!curr_cell.mv_ptr)
|
||||
return AVERROR_INVALIDDATA;
|
||||
copy_cell(ctx, plane, &curr_cell);
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user