[FFmpeg-cvslog] Merge commit '7e90133f6420b1c53652f972b9561600822881ee'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 14 14:02:19 2014 +0200| [dbd1fdd21400189f64aedde6a94ea14beca5a85e] | committer: Michael Niedermayer

Merge commit '7e90133f6420b1c53652f972b9561600822881ee'

* commit '7e90133f6420b1c53652f972b9561600822881ee':
  build: do not append $(FFLIBS-) to $(FFLIBS) if $(NAME) is not defined

Conflicts:
	common.mak

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

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