[FFmpeg-cvslog] Merge commit 'b83d1ee3b41cfe8357836e2582104db2f3364cb0'

Michael Niedermayer git at videolan.org
Fri Dec 27 12:18:23 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 27 12:01:23 2013 +0100| [25b243759cb63621c96f20fe9426a3d067be70bf] | committer: Michael Niedermayer

Merge commit 'b83d1ee3b41cfe8357836e2582104db2f3364cb0'

* commit 'b83d1ee3b41cfe8357836e2582104db2f3364cb0':
  avutil: Move library version related macros to version.h

Conflicts:
	libavcodec/version.h
	libavresample/version.h
	libavutil/avutil.h
	libavutil/utils.c

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

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





More information about the ffmpeg-cvslog mailing list