[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

Mon Nov 4 02:03:07 CET 2013

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov  4 01:20:46 2013 +0100| [1a4ffa5b136a112935e7db19eb49e6042c6d5143] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: Remove redundant OBJS declaration intended for programs

Conflicts:
	Makefile

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

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