Merge commit 'fa6eef4210c2fd7f7324d558b09311c75987a31e' into release/1.1
* commit 'fa6eef4210c2fd7f7324d558b09311c75987a31e': wtv: Mark attachment with a negative stream id avconv: do not use lavfi direct rendering with -deinterlace avidec: Let the inner dv demuxer take care of discarding Update Changelog kmvc: Clip pixel position to valid range kmvc: use fixed sized arrays in the context indeo: reject negative array indexes indeo: Cosmetic formatting indeo: Refactor ff_ivi_init_tiles and ivi_decode_blocks indeo: Refactor ff_ivi_dec_huff_desc indeo: use a typedef for the mc function pointer indeo: use proper error code Conflicts: Changelog ffmpeg.c libavcodec/ivi_common.c libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
2
ffmpeg.c
2
ffmpeg.c
@@ -1659,7 +1659,7 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output)
|
||||
|
||||
if (!frame_sample_aspect->num)
|
||||
*frame_sample_aspect = ist->st->sample_aspect_ratio;
|
||||
if (ist->dr1 && decoded_frame->type==FF_BUFFER_TYPE_USER && !changed) {
|
||||
if (ist->dr1 && decoded_frame->type==FF_BUFFER_TYPE_USER && !changed && !do_deinterlace) {
|
||||
FrameBuffer *buf = decoded_frame->opaque;
|
||||
AVFilterBufferRef *fb = avfilter_get_video_buffer_ref_from_arrays(
|
||||
decoded_frame->data, decoded_frame->linesize,
|
||||
|
Reference in New Issue
Block a user