diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-27 16:30:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-27 16:30:57 +0200 |
| commit | 09fcc2f865f5c8cc9dfbe9b3b55157a756d5fa9f (patch) | |
| tree | 42972f62881cd9b58f600636263b9062db338e46 /ffmpeg.c | |
| parent | 847d3225a8f9e3910d21915db52c3b38986a3fa9 (diff) | |
| parent | fa6eef4210c2fd7f7324d558b09311c75987a31e (diff) | |
| download | ffmpeg-09fcc2f865f5c8cc9dfbe9b3b55157a756d5fa9f.tar.gz | |
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>
Diffstat (limited to 'ffmpeg.c')
| -rw-r--r-- | ffmpeg.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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, |