[FFmpeg-cvslog] Merge commit '3e175a2a550f5c2f788e8cd969052e10a5025a27'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 15 12:34:11 2013 +0100| [9df00574fca16b3c8aa9892f9a3ed5bd6482833a] | committer: Michael Niedermayer

Merge commit '3e175a2a550f5c2f788e8cd969052e10a5025a27'

* commit '3e175a2a550f5c2f788e8cd969052e10a5025a27':
  avconv: mark attachment streams as immediately finished
  vaapi: fix argument for ff_vaapi_common_end_frame call

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

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