doc/developer: Add web links for all suggested licenses
doc/developer: Add ISC license to list of acceptable licenses
doc/developer: Drop obsolete MPlayer reference
bink: fix a check for the first frame.

Packet pts is a very unreliable indicator, use
AVCodecContext.frame_number instead.
bink demuxer: check malloc return value
bink demuxer: set framerate.
ppc: fmtconvert: Drop two unused variables.
Use proper "" quotes for local header #includes
Merge commit 'f2960097e42ddf9a356bab6547f87906f6999e0a'

* commit 'f2960097e42ddf9a356bab6547f87906f6999e0a':
  bink: fix a check for the first frame.
  doc/developer: Drop obsolete MPlayer reference
  doc/developer: Add ISC license to list of acceptable licenses
  doc/developer: Add web links for all suggested licenses

Conflicts:
	doc/developer.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '1730ca2eca42974af0c29f38a0770997cba2f0da'

* commit '1730ca2eca42974af0c29f38a0770997cba2f0da':
  bink demuxer: check malloc return value

See:
commit e400b95b3205d5b861346f525cf6f423d93d2f04
Author: Paul B Mahol <onemda@gmail.com>
Date:   Sat Jun 9 10:57:14 2012 +0000

    bink: check av_mallocz() return value

    Signed-off-by: Paul B Mahol <onemda@gmail.com>

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Use proper "" quotes for local header #includes
  ppc: fmtconvert: Drop two unused variables.
  bink demuxer: set framerate.

Conflicts:
	libavcodec/kbdwin.c
	libavcodec/ppc/fmtconvert_altivec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/muxers.texi: Fix mp3 picture attachment documentation.
doc/muxers: fix level for the segment options subsection

Properly declare it like a @subsection, rather than as a @section.
doc/filters: fix syntax and description for the lut* options
doc/filters: create a dedicated examples section for lut*, and itemize
doc/filters: fix syntax and typo for the afade curve option
ffmpeg: fix broken channel_layout option

Fixes ticket #2163.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>