Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 3 Oct 2013 10:04:37 +0000 (12:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 3 Oct 2013 10:04:37 +0000 (12:04 +0200)
commit5a63fb66936a2732b9d59edf3cebc4b6291f5d08
tree97184fab232f0f86119a32b79c625e1b4f1df358
parentc4f3b55f507955a5db45802b09a1a38ff7f8bb8d
parent451606f7ce7e22aef989da3af49c48b663065d70
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavc: mark deprecated AVCodec.max_lowres for removal on next bump

Conflicts:
libavcodec/avcodec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/avcodec.h