1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
FFmpeg/libavformat
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
..
2013-01-22 20:27:05 +01:00
2013-01-30 22:17:52 +00:00
2013-01-24 15:02:44 +00:00
2013-01-24 15:02:44 +00:00
2013-01-21 02:50:02 +01:00
2013-01-07 10:19:49 +00:00
2013-01-25 00:04:22 +01:00
2013-01-07 11:43:20 +00:00
2013-01-17 04:55:14 +01:00
2013-01-11 10:07:52 +00:00
2013-01-21 16:41:50 +01:00
2013-01-15 20:19:28 +01:00
2013-01-07 11:43:20 +00:00
2013-01-14 13:13:00 +02:00
2013-01-06 18:48:51 +01:00
2013-01-06 18:48:51 +01:00
2013-01-23 19:27:14 +01:00
2013-01-07 10:08:38 +00:00
2013-01-07 10:08:38 +00:00
2013-01-07 10:08:38 +00:00
2013-01-07 10:08:38 +00:00
2013-01-20 20:59:30 +01:00
2013-01-07 23:14:58 +11:00
2013-01-07 13:25:20 +01:00