[FFmpeg-cvslog] Merge commit '202c2acc40a6de8758b44ab3f5c85ab250079734'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 13 13:53:02 2013 +0100| [a62fced394825101b202a8bc6055e4932b371089] | committer: Michael Niedermayer

Merge commit '202c2acc40a6de8758b44ab3f5c85ab250079734'

* commit '202c2acc40a6de8758b44ab3f5c85ab250079734':
  vda: remove async decoder leftovers

Conflicts:
	libavcodec/vda_h264.c

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

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