[FFmpeg-cvslog] Merge commit 'e6ed8668597cfea25dfb350a9b4df7fb2efc1d90'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct 10 12:06:17 2013 +0200| [7acb464f0e8c277a19a19f87f2cc7a71fc6e0bc8] | committer: Michael Niedermayer

Merge commit 'e6ed8668597cfea25dfb350a9b4df7fb2efc1d90'

* commit 'e6ed8668597cfea25dfb350a9b4df7fb2efc1d90':
  flvenc: Write proper cropping for VP6 even if there's no extradata

Conflicts:
	libavformat/flvenc.c

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

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