[FFmpeg-cvslog] Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'

Michael Niedermayer git at videolan.org
Fri Mar 14 00:07:45 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 14 00:01:30 2014 +0100| [4104eb44e629d1469918e73587649fd3b2d992ba] | committer: Michael Niedermayer

Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'

* commit '55519926ef855c671d084ccc151056de9e3d3a77':
  x86: Make function prototype comments in assembly code consistent

Conflicts:
	libavcodec/x86/sbrdsp.asm

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4104eb44e629d1469918e73587649fd3b2d992ba
---





More information about the ffmpeg-cvslog mailing list