[FFmpeg-cvslog] Merge commit '778111592bf5f38630858ee6dfcfd097cd6c6da9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun 20 17:15:39 2014 +0200| [c2b1225c16f14a23a89c3eedbae51e6bc5667bc8] | committer: Michael Niedermayer

Merge commit '778111592bf5f38630858ee6dfcfd097cd6c6da9'

* commit '778111592bf5f38630858ee6dfcfd097cd6c6da9':
  dvenc: initialize the profile only once, at init

Conflicts:
	libavcodec/dvenc.c

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

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