Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Mar 2014 15:45:29 +0000 (16:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Mar 2014 15:46:06 +0000 (16:46 +0100)
commit33a7e288ab2e453d110e1bd1da944ad5cabf833b
tree7d1e714635ac7c405ac0a865db6b61b11cc1a010
parent1046cd60d4b19d6376dd18164959c3ea30477855
parentd1780e01b8b7d6977260e7136243bf5fccd878ce
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avconv: don't warn on multiple frames per packet for codecs that expect it

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