aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/indeo2.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-08-07 21:49:00 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-08-07 21:49:00 +0200
commitbc773d0d422f6eb541b44d4c021831e804e103f7 (patch)
tree8969818358a69c400af6c594a9858f18d6a690e5 /libavcodec/indeo2.c
parent0049af262825254705bdbb97c28004dd7c7c2b24 (diff)
parentf5d2c597e99af218b0d4d1cf9737c7e68ee934e4 (diff)
downloadffmpeg-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 'libavcodec/indeo2.c')
0 files changed, 0 insertions, 0 deletions