diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-07 21:49:00 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-07 21:49:00 +0200 |
commit | bc773d0d422f6eb541b44d4c021831e804e103f7 (patch) | |
tree | 8969818358a69c400af6c594a9858f18d6a690e5 /libswscale/x86/scale.asm | |
parent | 0049af262825254705bdbb97c28004dd7c7c2b24 (diff) | |
parent | f5d2c597e99af218b0d4d1cf9737c7e68ee934e4 (diff) | |
download | ffmpeg-bc773d0d422f6eb541b44d4c021831e804e103f7.tar.gz |
Merge commit 'f5d2c597e99af218b0d4d1cf9737c7e68ee934e4'
* commit 'f5d2c597e99af218b0d4d1cf9737c7e68ee934e4':
build: fix library installation on cygwin
mpc8: add a flush function
mpc8: set packet duration and stream start time instead of tracking frames
Conflicts:
libavformat/mpc8.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/x86/scale.asm')
0 files changed, 0 insertions, 0 deletions