[FFmpeg-cvslog] Merge commit '33259118155764ce27a3433894659dda1d148b5f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 31 21:49:58 2014 +0200| [c43ebd94e4234cd075e23386205992aedd3f8573] | committer: Michael Niedermayer

Merge commit '33259118155764ce27a3433894659dda1d148b5f'

* commit '33259118155764ce27a3433894659dda1d148b5f':
  h263: improve hwaccel #ifdefs

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c43ebd94e4234cd075e23386205992aedd3f8573
---