Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 4 Aug 2011 18:59:29 +0000 (20:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 4 Aug 2011 18:59:36 +0000 (20:59 +0200)
commit84a6abd95420f6552c30b11ab5585fdb306269ba
treeb3c381308d192bd3d4210c6bafee61fce91f37f2
parent82b1516a85ad21b5455dcfef6fe49d1189565c33
parent1bf6cb85bebe639c836cdbb4498ea5bc252a7c21
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  applehttp: fix variant discard logic
  h263dec: Fix asserts broken by the elimination of FF_COMMON_FRAME.

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