[FFmpeg-cvslog] Merge commit '4d7aeff9a1080e64125f3374d993b2c9c4c2751b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct 10 11:45:45 2013 +0200| [0efbd98e233194659d6ff47e871924d0756539b5] | committer: Michael Niedermayer

Merge commit '4d7aeff9a1080e64125f3374d993b2c9c4c2751b'

* commit '4d7aeff9a1080e64125f3374d993b2c9c4c2751b':
  flvenc: Don't pretend to support muxing "plain" VP6

Conflicts:
	libavformat/flvenc.c

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

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