Merge commit '5e2ba41d4b94de1fa5267081d6c4b6b262c8d86f'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 15 May 2014 19:01:07 +0000 (21:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 15 May 2014 19:01:07 +0000 (21:01 +0200)
commitfcb5849a62e5e6aac8fe6203443105f6dd46cbf6
treee1d13ab5500f969683a618b6031eb9b1156a3e8d
parentaf31d58a635b50da4132e0a00b00abb631a28a62
parent5e2ba41d4b94de1fa5267081d6c4b6b262c8d86f
Merge commit '5e2ba41d4b94de1fa5267081d6c4b6b262c8d86f'

* commit '5e2ba41d4b94de1fa5267081d6c4b6b262c8d86f':
  build: add avresample after avcodec to FFLIBS

Conflicts:
Makefile

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