* qatar/master: h263dec: Remove a hack that can cause infinite loops Conflicts: libavcodec/h263dec.c See: d2981b8ef1 Merged-by: Michael Niedermayer <michaelni@gmx.at>
d2981b8ef1