Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Sep 2013 08:48:14 +0000 (10:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Sep 2013 08:59:22 +0000 (10:59 +0200)
* qatar/master:
  h263dec: Remove a hack that can cause infinite loops

Conflicts:
libavcodec/h263dec.c

See: d2981b8ef191fc7876e3486e42222ab6a8777c24
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/h263dec.c

Simple merge