Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 11 Jan 2014 19:40:35 +0000 (20:40 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 11 Jan 2014 19:56:29 +0000 (20:56 +0100)
commit419787a2ffe31c6c70e542aae8c93c00f3aeb237
tree443014672a78e5092b1910e62af847a95c6d240e
parent5856bca360c5bc3e340a357d91b1f993c80a7bea
parent547f8345373843fe4428e2b3de6b46de4df797af
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  flv: Workaround for buggy Omnia A/XE encoder

Conflicts:
libavformat/flvdec.c

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