Merge commit '4b39cc1a093c239412ded522c4a899744e7f2008'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 15 Nov 2014 00:45:32 +0000 (01:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 15 Nov 2014 00:47:39 +0000 (01:47 +0100)
commit720a8d2b7518fd8bf69a5fe470f35dd0cb0aafb6
treed31ce2ee5db47f40da69f7912d855ccc6ce23cff
parente6e6149630464939fb45b526a90a4dcdb4ff1841
parent4b39cc1a093c239412ded522c4a899744e7f2008
Merge commit '4b39cc1a093c239412ded522c4a899744e7f2008'

* commit '4b39cc1a093c239412ded522c4a899744e7f2008':
  riff: support ProRes in avi (APCN fourcc)

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