[FFmpeg-cvslog] Merge commit 'fcc1022611f79c2f3aa2f392a5ce14c74be9c1d7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct  6 12:04:25 2014 +0200| [b64b719ad5c212e197009fa3f1e7aa96255cbd28] | committer: Michael Niedermayer

Merge commit 'fcc1022611f79c2f3aa2f392a5ce14c74be9c1d7'

* commit 'fcc1022611f79c2f3aa2f392a5ce14c74be9c1d7':
  vdpau: factor out common end-of-frame handling

Conflicts:
	libavcodec/vdpau.c
	libavcodec/vdpau_h264.c

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

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