Merge commit '3e175a2a550f5c2f788e8cd969052e10a5025a27'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 15 Mar 2013 11:34:11 +0000 (12:34 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 15 Mar 2013 11:54:05 +0000 (12:54 +0100)
commit9df00574fca16b3c8aa9892f9a3ed5bd6482833a
tree09b4db98560b0bc4463a4edb8b96a1c208fbd7fe
parent8a523cfa8b922885ba4f2e9a5e7a2ac3b7bcb54b
parent3e175a2a550f5c2f788e8cd969052e10a5025a27
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@gmx.at>
ffmpeg_opt.c
libavcodec/vaapi.c