Merge commit 'c78dc12118cb5b2a69a17f38c69f77a42e89a9c4'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 22:42:26 +0000 (23:42 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 22:42:54 +0000 (23:42 +0100)
commit97bd0e2a93f1a36b377ebb181ba0fe56e93e6c03
treece6a380a5d7a037b11bba77e32d0f37e50d38683
parentd06dce21a454f541acec329aa5299e67cd9d0994
parentc78dc12118cb5b2a69a17f38c69f77a42e89a9c4
Merge commit 'c78dc12118cb5b2a69a17f38c69f77a42e89a9c4'

* commit 'c78dc12118cb5b2a69a17f38c69f77a42e89a9c4':
  riff: Support ProRes in avi (APCH fourcc)

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