OSDN Git Service

Merge commit '71f7b22dba60524b2285643ae0b49d8f64977129'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Oct 2012 12:35:47 +0000 (14:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Oct 2012 12:37:15 +0000 (14:37 +0200)
commit69fd0b7adbd22f24d45b6edb10eaf37d18c66bee
tree9ed4b452f0f2668e0319825e1c341a6c4e7b7bfb
parente4255eaf47373c0c1691cbcbc0816253e938b662
parent71f7b22dba60524b2285643ae0b49d8f64977129
Merge commit '71f7b22dba60524b2285643ae0b49d8f64977129'

* commit '71f7b22dba60524b2285643ae0b49d8f64977129':
  ffv1: split decoder and encoder

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/ffv1.c
libavcodec/ffv1.h
libavcodec/ffv1dec.c
libavcodec/ffv1enc.c