Merge commit '4d7aeff9a1080e64125f3374d993b2c9c4c2751b'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Oct 2013 09:45:45 +0000 (11:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Oct 2013 09:45:45 +0000 (11:45 +0200)
commit0efbd98e233194659d6ff47e871924d0756539b5
tree0fef16d3e187bee03dd4f71cc1d73cfcf2ea8a2b
parent70025c07a70334756b429f2892ee9ee9bbec119f
parent4d7aeff9a1080e64125f3374d993b2c9c4c2751b
Merge commit '4d7aeff9a1080e64125f3374d993b2c9c4c2751b'

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

Conflicts:
libavformat/flvenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/flvenc.c