avformat: Move av_probe_input* to format.c
avstring: Expose the simple name match function

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
avformat: Use the mime type information in input probe

It should provide a quicker guess for elementary streams provided
by http.
aac: Register the mime type

Speed up probing ADTS live streams that are not frame-aligned such
as http://mp3.streampower.be/radio1.aac .
matroska: Register mime types
mpegvideo: move vol_control_parameters to the only place it is used

Signed-off-by: Diego Biurrun <diego@biurrun.de>
Merge commit 'e253a9e2b3d683eb51db7c776326eb07de10ad4c'

* commit 'e253a9e2b3d683eb51db7c776326eb07de10ad4c':
  avformat: Move av_probe_input* to format.c

Conflicts:
	libavformat/format.c
	libavformat/utils.c

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

* commit '69e7336b8e16ee65226fc20381baf537f4b125e6':
  avstring: Expose the simple name match function

Conflicts:
	libavutil/avstring.c
	libavutil/avstring.h
	libavutil/version.h

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

* commit '3a19405d574a467c68b48e4b824c76617fd59de0':
  avformat: Use the mime type information in input probe

Conflicts:
	libavformat/format.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
avformat: fix probe mime version checks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '02cf0c9e42967de1e4d2803bee3573bc5b735fdd'

* commit '02cf0c9e42967de1e4d2803bee3573bc5b735fdd':
  aac: Register the mime type

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

* commit 'fa38573cd9ce4ab727f86f57c03b113cfd4c9d0a':
  matroska: Register mime types

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

* commit 'ccbf370f2000b9b27f4af259c23007d67f7ea46e':
  mpegvideo: move vol_control_parameters to the only place it is used

Merged-by: Michael Niedermayer <michaelni@gmx.at>
avformat/format: simplify ifdeffery

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avformat/format.c: remove duplicate include, put libavutil includes together

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avformat/format: fix memleak and error code

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