From: Michael Niedermayer Date: Wed, 2 Apr 2014 16:01:48 +0000 (+0200) Subject: Merge commit '9d599e3f6e61438772d8cddd6c9b7c495251f51e' X-Git-Tag: n2.3~1986 X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=91a0d3af651732d80b5c01777ea1c7ec541ec554;hp=91a0d3af651732d80b5c01777ea1c7ec541ec554 Merge commit '9d599e3f6e61438772d8cddd6c9b7c495251f51e' * commit '9d599e3f6e61438772d8cddd6c9b7c495251f51e': avi: Improve non-interleaved detection Conflicts: libavformat/avidec.c See: 8df774be88c347c40f1b2411ed9e391dfec0ebb7 and others Merged-by: Michael Niedermayer ---