Merge commit '7f954ca502a16feeca44d4e9a7d450b404dabc94' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 15:59:58 +0000 (17:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 15:59:58 +0000 (17:59 +0200)
commit2aa659233810cb17e4748a52298d018fa9cb8d4a
treeda11daaff98df52c5b4e703e7a429ed23d1e59d5
parent2b14d980863d7a4044d20978ba5b3bda1c96f607
parent7f954ca502a16feeca44d4e9a7d450b404dabc94
Merge commit '7f954ca502a16feeca44d4e9a7d450b404dabc94' into release/2.2

* commit '7f954ca502a16feeca44d4e9a7d450b404dabc94':
  avi: Improve non-interleaved detection

Conflicts:
Changelog
libavformat/avidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/avidec.c