avconv: simplify exit_program() by using more local vars
avconv: rename InputStream.opts to InputStream.decoder_opts

This makes it more clear what is this variable for exactly.
avconv: rename 'icodec' to 'dec_ctx'

This more clearly describes what is the variable used for.
avconv: rename 'codec' to 'enc_ctx'

This more clearly describes what is the variable used for.

Also, move its declaration into the block where it is actually used.
avconv: remove a useless line

Doing anything with that field when we are doing streamcopy (so the
encoder is not opened) should have absolutely no effect.
avconv: rename OutputStream.opts to OutputStream.encoder_opts

This makes it more clear what is this variable for exactly.
libfdk-aacenc: Enable 7.1 channel encoding

7.1(wide) and 7.1(wide-side) channel layouts are supported in
fdk-aac since the 0.1.3 release.

The earlier versions of fdk-aac didn't include any library
version defines in the public headers, thus checking for
the AACENCODER_LIB_VL0 define is enough to know that we're
building against a new enough version of fdk-aac.

This change includes contributions by Tim Walker,
Michael Niedermayer and Timothy Gu.

Signed-off-by: Martin Storsjö <martin@martin.st>
libfdk-aac: Relicense the library wrappers to 2-clause BSD

This should make it possible for Fraunhofer to contribute to these
wrappers - they didn't want to contribute to code under LGPL2.1 with
the "or any later version" clause (which allowed using the code
under the LGPL3 license).

Signed-off-by: Martin Storsjö <martin@martin.st>
Merge commit '73ed8558a61c4f1d0ce8d1f35183ac1a0a4e31e3'

* commit '73ed8558a61c4f1d0ce8d1f35183ac1a0a4e31e3':
  avconv: simplify exit_program() by using more local vars

Conflicts:
	ffmpeg.c

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

* commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66':
  avconv: rename InputStream.opts to InputStream.decoder_opts

Conflicts:
	ffmpeg.c

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

* commit '650a5206a944fd36a42d92f98e745972056b1f7c':
  avconv: rename 'icodec' to 'dec_ctx'

Conflicts:
	ffmpeg.c

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

* commit '65ed9e7585e86e6c728bc762ac9944b157e39f8d':
  avconv: rename 'codec' to 'enc_ctx'

Conflicts:
	ffmpeg.c

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

* commit '01947f07b81a57fb1e15114b710f6d5ae4f70a11':
  avconv: remove a useless line

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

* commit '9580818c5d934bde65a95efd2cee61c174721092':
  avconv: rename OutputStream.opts to OutputStream.encoder_opts

Conflicts:
	ffmpeg.c
	ffmpeg.h

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

* commit '15fa856b82ea7dbbf69edc1074eb13dd00b0fa84':
  libfdk-aacenc: Enable 7.1 channel encoding

See: 91489d28ba271fb9dde54cb26e7ae93ada2997df, and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '3828eb8519c1530392ab8820b1aa784602128afc'

* commit '3828eb8519c1530392ab8820b1aa784602128afc':
  libfdk-aac: Relicense the library wrappers to 2-clause BSD

Conflicts:
	libavcodec/libfdk-aacdec.c
	libavcodec/libfdk-aacenc.c

<Daemon404> michaelni, fyi, for the fdk relicensing, wbs also contact all the ffmpeg-only contributers
<Daemon404> so it should be fine to merge.

Thanks-to: Martin Storsjö <martin@martin.st>
Merged-by: Michael Niedermayer <michaelni@gmx.at>
avformat/astenc: avoid using AVCodecContext.frame_number

Theres no gurantee that the user application has initialized it

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