[FFmpeg-cvslog] Merge commit 'f1c4a54f6ecbf77a29aaaee09ca70c5468d0c509'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr  2 03:14:53 2014 +0200| [61b3b3315c465ca7d74d3e95a881470642afddbc] | committer: Michael Niedermayer

Merge commit 'f1c4a54f6ecbf77a29aaaee09ca70c5468d0c509'

* commit 'f1c4a54f6ecbf77a29aaaee09ca70c5468d0c509':
  lavf: add supported extension to avi and mov demuxers

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=61b3b3315c465ca7d74d3e95a881470642afddbc
---