Merge commit '28ff439efd2362fb21e1a78610737f2e26a72d8f'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Sep 2013 21:24:27 +0000 (23:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Sep 2013 21:24:27 +0000 (23:24 +0200)
* commit '28ff439efd2362fb21e1a78610737f2e26a72d8f':
  mvi: Add sanity checking for the audio frame size

Conflicts:
libavformat/mvi.c

See: ea1d8465e6eca582c09e2526f677033b62576fda
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/mvi.c

Simple merge