Merge commit '4bb1070c154e49d35805fbcdac9c9e92f702ef96'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 22 Nov 2015 16:55:56 +0000 (16:55 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 22 Nov 2015 16:57:43 +0000 (16:57 +0000)
commitbba2488f074904069e38865654413ec44d35ec24
treee9a6a7ec8dc52da3901726389f9e7fbb7abf58ce
parent3c110b009b8efd3650f1b8caf31c331ee775f0ee
parent4bb1070c154e49d35805fbcdac9c9e92f702ef96
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@gmail.com>
libavcodec/ffv1.c
libavcodec/ffv1.h
libavcodec/ffv1dec.c
libavcodec/ffv1enc.c