Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 23 Nov 2013 13:43:08 +0000 (14:43 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 23 Nov 2013 13:46:48 +0000 (14:46 +0100)
commit3e641b4842b8b5f6592991479d19f1a7ce846308
tree25bee33d11ceddf0ee1758dd8cf5763764d5fc80
parent62e10c375968d9cbbe2a0bc321e00eef52d32917
parent7671dd7cd7d51bbd637cc46d8f104a141bc355ea
Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'

* commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea':
  avconv: add support for VDPAU decoding

Conflicts:
Changelog
Makefile
configure
ffmpeg.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
Makefile
configure
doc/ffmpeg.texi
ffmpeg.h
ffmpeg_opt.c
ffmpeg_vdpau.c