Merge commit 'b83d1ee3b41cfe8357836e2582104db2f3364cb0'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 27 Dec 2013 11:01:23 +0000 (12:01 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 27 Dec 2013 11:01:23 +0000 (12:01 +0100)
commit25b243759cb63621c96f20fe9426a3d067be70bf
tree1e535335b05392a328b508b3da3aae7e44a84f8e
parente630ca5111077fa8adc972fe8a3d7e2b3e8dc91f
parentb83d1ee3b41cfe8357836e2582104db2f3364cb0
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@gmx.at>
libavcodec/version.h
libavdevice/version.h
libavfilter/version.h
libavformat/version.h
libavresample/version.h
libavutil/utils.c
libavutil/version.h
libswscale/version.h