[FFmpeg-cvslog] Merge commit 'e63b818dbe6060b606ae10eb184859f8b97d2353'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun 27 19:13:34 2014 +0200| [3ac51145304f9996152a80f5a191ced7b857a252] | committer: Michael Niedermayer

Merge commit 'e63b818dbe6060b606ae10eb184859f8b97d2353'

* commit 'e63b818dbe6060b606ae10eb184859f8b97d2353':
  dv: Properly split decoder and encoder initialization

Conflicts:
	libavcodec/dv.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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