Merge branch 'master' into 0.11

This commit is contained in:
Edward Hervey 2011-06-08 18:04:38 +02:00
commit aaa07b3b4c

View file

@ -2598,8 +2598,8 @@ gst_ffmpegdec_chain (GstPad * pad, GstBuffer * inbuf)
}
}
ffmpegdec->last_in = in_timestamp;
ffmpegdec->last_frames = 0;
}
ffmpegdec->last_frames = 0;
/* workarounds, functions write to buffers:
* libavcodec/svq1.c:svq1_decode_frame writes to the given buffer.