[FFmpeg-cvslog] Merge commit '28ff439efd2362fb21e1a78610737f2e26a72d8f'

Michael Niedermayer git at videolan.org
Sun Sep 29 23:29:40 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Sep 29 23:24:27 2013 +0200| [2f8418b584d2e3d742b6c1c3b320e37c55a3df95] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2f8418b584d2e3d742b6c1c3b320e37c55a3df95
---





More information about the ffmpeg-cvslog mailing list