Merge commit '33259118155764ce27a3433894659dda1d148b5f'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 31 Mar 2014 19:49:58 +0000 (21:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 31 Mar 2014 19:50:24 +0000 (21:50 +0200)
* commit '33259118155764ce27a3433894659dda1d148b5f':
  h263: improve hwaccel #ifdefs

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

Simple merge