aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/time.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-02-01 14:34:18 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-02-01 14:34:18 +0100
commit911e2706884020caf8b9b8ca67a2ad3801f067f4 (patch)
tree7ba99b5be6270aaeffab8bf53deae8cc7d93cdd9 /libavutil/time.c
parent1bc51a7a74fc1ae005a70af36c9f01b7b8463994 (diff)
parent6c1a7d07eb41b4cf36e48ebb560fecd9504fd968 (diff)
downloadffmpeg-911e2706884020caf8b9b8ca67a2ad3801f067f4.tar.gz
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>
Diffstat (limited to 'libavutil/time.c')
0 files changed, 0 insertions, 0 deletions