[FFmpeg-cvslog] Merge commit '56daf10e0313c5e36f43e773f457d2a99ff0df10'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 24 13:15:52 2013 +0100| [663ebae79a3e556d8be5004057f805dd82e21062] | committer: Michael Niedermayer

Merge commit '56daf10e0313c5e36f43e773f457d2a99ff0df10'

* commit '56daf10e0313c5e36f43e773f457d2a99ff0df10':
  mov: use the format context for logging.
  flicvideo: avoid an infinite loop in byte run compression

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

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