[FFmpeg-cvslog] Merge commit '6f1ec8edf2416441e2348f3a0915c9fee179d7da'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov 19 18:18:47 2013 +0100| [066dbfe1655b484281fda10a4433cbd82765217d] | committer: Michael Niedermayer

Merge commit '6f1ec8edf2416441e2348f3a0915c9fee179d7da'

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

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

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