[FFmpeg-cvslog] Merge commit 'c231987662194d009dd91bfc57c678e0e70ca161'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Sep 30 00:32:01 2013 +0200| [143a19f5c73b95c177aa03dd41ce85e03e2d13c2] | committer: Michael Niedermayer

Merge commit 'c231987662194d009dd91bfc57c678e0e70ca161'

* commit 'c231987662194d009dd91bfc57c678e0e70ca161':
  mov: Make sure the read sample count is nonnegative

Conflicts:
	libavformat/mov.c

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

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