Merge commit 'e6ed8668597cfea25dfb350a9b4df7fb2efc1d90'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Oct 2013 10:06:17 +0000 (12:06 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Oct 2013 10:06:17 +0000 (12:06 +0200)
commit7acb464f0e8c277a19a19f87f2cc7a71fc6e0bc8
tree5e373d4d2393bee85f19c1c2d0c238c5bc7d49ee
parentc2555bcbd147d068c47363ba294e9c21cfceb6c7
parente6ed8668597cfea25dfb350a9b4df7fb2efc1d90
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@gmx.at>
libavformat/flvenc.c