Merge commit '2007082d2db25f9305b8a345798b840ea7784fdb'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 18 Nov 2014 02:33:35 +0000 (03:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 18 Nov 2014 02:34:05 +0000 (03:34 +0100)
commit4cd4a6de4f976a5bf79b564daa23c97cce545caf
treed0aa23553a479abf04ba24cbd3fcf53f2d48db58
parentcdbebae44440bea97f300f256d722c1495753bc2
parent2007082d2db25f9305b8a345798b840ea7784fdb
Merge commit '2007082d2db25f9305b8a345798b840ea7784fdb'

* commit '2007082d2db25f9305b8a345798b840ea7784fdb':
  mov: check ff_get_wav_header() return value

Conflicts:
libavformat/mov.c

See: 6d55a40b00801899f7975b22401bdd96bbc228af
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mov.c