Merge commit '90411b333d6b6bb69d8937117b9250785730dc53'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Dec 2014 20:02:42 +0000 (21:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Dec 2014 20:04:30 +0000 (21:04 +0100)
* commit '90411b333d6b6bb69d8937117b9250785730dc53':
  Allow reading of growing avi files (currently being written)

Conflicts:
libavformat/avidec.c
tests/ref/fate/cvid-partial

See: e42a3dd123c47efd7921f93d4a1f6f53c196ad4a
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge