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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug 30 17:28:21 2012 +0200| [e8e4c8bddee7b77747346ca5047a84cc40dafc11] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: allow non-standard variations of linker -l/-L flags
  Add reminders to update the codec descriptor list with new codec IDs.

Conflicts:
	Makefile
	configure
	libavcodec/avcodec.h
	libavformat/Makefile

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

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