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)
commit2f8418b584d2e3d742b6c1c3b320e37c55a3df95
tree3b6e899c5a5bd420e8074ae02c20f94262d14aac
parent9e58d46edf95e5da585e613b22e1255cf279b5cf
parent28ff439efd2362fb21e1a78610737f2e26a72d8f
Merge commit '28ff439efd2362fb21e1a78610737f2e26a72d8f'

* commit '28ff439efd2362fb21e1a78610737f2e26a72d8f':
  mvi: Add sanity checking for the audio frame size

Conflicts:
libavformat/mvi.c

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