Merge commit '4719040cd1b54381796b22056a9ae37bd2b4668d'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 22 Jul 2013 08:20:05 +0000 (10:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 22 Jul 2013 08:23:46 +0000 (10:23 +0200)
commitb909428dabe31b6c55fff57d743b3eaddd449e7a
treecdb30ad48c128245dd02d97d4d6a4e1242e0cc7a
parent5feaa451bb6513952c3c7acbccb6f5cf17a40790
parent4719040cd1b54381796b22056a9ae37bd2b4668d
Merge commit '4719040cd1b54381796b22056a9ae37bd2b4668d'

* commit '4719040cd1b54381796b22056a9ae37bd2b4668d':
  libx264: Define X264_API_IMPORTS on MSVC/ICL

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/libx264.c