[FFmpeg-cvslog] Merge commit '71f7b22dba60524b2285643ae0b49d8f64977129'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Oct 21 14:35:47 2012 +0200| [69fd0b7adbd22f24d45b6edb10eaf37d18c66bee] | committer: Michael Niedermayer

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 at gmx.at>

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