Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Feb 2013 13:34:18 +0000 (14:34 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Feb 2013 13:34:18 +0000 (14:34 +0100)
commit911e2706884020caf8b9b8ca67a2ad3801f067f4
tree7ba99b5be6270aaeffab8bf53deae8cc7d93cdd9
parent1bc51a7a74fc1ae005a70af36c9f01b7b8463994
parent6c1a7d07eb41b4cf36e48ebb560fecd9504fd968
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>
libavcodec/arm/videodsp_init_armv5te.c
libavcodec/kbdwin.c
libavcodec/ppc/fmtconvert_altivec.c
libavformat/bink.c
libavformat/rtp.c