Merge commit '03562c44c0c1e59d2a598390c5b2181ac406611c' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 14:50:32 +0000 (16:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 14:50:32 +0000 (16:50 +0200)
commit6a356801952b6c38042ef267808dbacbdb700eef
treea7b7b06d6f14b7fa6be7e1c67d5d261205259957
parentcb29eb144b81cfded4d7c9a9220f45834b3d4612
parent03562c44c0c1e59d2a598390c5b2181ac406611c
Merge commit '03562c44c0c1e59d2a598390c5b2181ac406611c' into release/1.1

* commit '03562c44c0c1e59d2a598390c5b2181ac406611c':
  avi: Improve non-interleaved detection

Conflicts:
libavformat/avidec.c

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