tools/qt-faststart.c · 0bb474f686fb33ef731e34972e48b82dfbf82984 · libremedia / Tethys / FFmpeg

11 years ago

Michael Niedermayer authored 11 years ago


* commit 'ea15a9a5':
  qt-faststart: Simplify code by using a MIN() macro

Conflicts:
	tools/qt-faststart.c

See: 59003fe7
Merged-by: Michael Niedermayer <michaelni@gmx.at>

0bb474f6

History

Merge commit ''

Michael Niedermayer authored 11 years ago


* commit 'ea15a9a5':
  qt-faststart: Simplify code by using a MIN() macro

Conflicts:
	tools/qt-faststart.c

See: 59003fe7
Merged-by: Michael Niedermayer <michaelni@gmx.at>