ffmpeg.h · d73f8976691f72296d70b7a57b68a690a7ade662 · libremedia / Tethys / FFmpeg

11 years ago

Michael Niedermayer authored 11 years ago


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

Conflicts:
	Changelog
	Makefile
	configure
	ffmpeg.h

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

3e641b48

History

Merge commit ''

Michael Niedermayer authored 11 years ago


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

Conflicts:
	Changelog
	Makefile
	configure
	ffmpeg.h

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

ffmpeg.h 14.51 KiB