Merge commit '56daf10e0313c5e36f43e773f457d2a99ff0df10'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Feb 2013 12:15:52 +0000 (13:15 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Feb 2013 12:15:59 +0000 (13:15 +0100)
commit663ebae79a3e556d8be5004057f805dd82e21062
tree6ac81137a69515c7b4180deeea159b6116f7235c
parentea2de3d09614fcfe53b9406cce57a1bf8cf6d5cd
parent56daf10e0313c5e36f43e773f457d2a99ff0df10
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@gmx.at>
libavcodec/flicvideo.c
libavformat/mov.c