[FFmpeg-cvslog] Merge commit '4bb1070c154e49d35805fbcdac9c9e92f702ef96'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Sun Nov 22 16:55:56 2015 +0000| [bba2488f074904069e38865654413ec44d35ec24] | committer: Derek Buitenhuis

Merge commit '4bb1070c154e49d35805fbcdac9c9e92f702ef96'

* commit '4bb1070c154e49d35805fbcdac9c9e92f702ef96':
  ffv1: Explicitly name the coder type

  Conflicts:
      libavcodec/ffv1.h
      libavcodec/ffv1dec.c
      libavcodec/ffv1enc.c

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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