[FFmpeg-cvslog] Merge commit 'e767c9e8f2eaa116b61b8b6881b401b54bd320f5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar  4 20:42:33 2015 +0100| [735ab7c5e04e2316afbd56643c13de17a7ac89cd] | committer: Michael Niedermayer

Merge commit 'e767c9e8f2eaa116b61b8b6881b401b54bd320f5'

* commit 'e767c9e8f2eaa116b61b8b6881b401b54bd320f5':
  flv: Validate and reject unsupported codecs

Conflicts:
	libavformat/flvenc.c

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

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