Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 30 Aug 2012 15:28:21 +0000 (17:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 30 Aug 2012 15:28:21 +0000 (17:28 +0200)
commite8e4c8bddee7b77747346ca5047a84cc40dafc11
tree8062747ec4d71f28da7fc9377af81cea3394022b
parentf4c020e3ad0a2a1412cc94b3d7df7063b37ae429
parent8db73c61a7b24bc4f4d3d415bea2990d17d16354
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@gmx.at>
common.mak
configure
doc/developer.texi
libavcodec/avcodec.h
library.mak