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)
* 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>
1  2 
libavcodec/h263dec.c
libavformat/applehttp.c

Simple merge
Simple merge