Michael Niedermayer 911e270688 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  Use proper "" quotes for local header #includes
  ppc: fmtconvert: Drop two unused variables.
  bink demuxer: set framerate.

Conflicts:
	libavcodec/kbdwin.c
	libavcodec/ppc/fmtconvert_altivec.c

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

2013-02-01 14:34:18 +01:00

9.1 KiB

Raw Blame History

View Raw