[FFmpeg-cvslog] Merge commit 'd1016dccdcb10486245e5d7c186cc31af54b2a9c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr  4 14:20:51 2013 +0200| [208be6b54a91b7da699497d0bb361dbf542d6518] | committer: Michael Niedermayer

Merge commit 'd1016dccdcb10486245e5d7c186cc31af54b2a9c'

* commit 'd1016dccdcb10486245e5d7c186cc31af54b2a9c':
  xmv: check audio track parameters validity.
  bmv: check for len being valid in bmv_decode_frame().

Conflicts:
	libavformat/xmv.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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