Merge commit '6f1ec8edf2416441e2348f3a0915c9fee179d7da'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Nov 2013 17:18:47 +0000 (18:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Nov 2013 17:19:06 +0000 (18:19 +0100)
commit066dbfe1655b484281fda10a4433cbd82765217d
tree657143fb6d458a0051db938f62352aae95501160
parent6a71efff33e74d2c0ca73684ffb5dc3f58841f51
parent6f1ec8edf2416441e2348f3a0915c9fee179d7da
Merge commit '6f1ec8edf2416441e2348f3a0915c9fee179d7da'

* commit '6f1ec8edf2416441e2348f3a0915c9fee179d7da':
  avcodec.h: include version.h before using version macro

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/avcodec.h