Derek Buitenhuis bba2488f07 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>

2015-11-22 16:57:43 +00:00

7.0 KiB

Raw Blame History

View Raw