arm: Mangle external symbols properly in new vfp assembly files

Signed-off-by: Martin Storsjö <martin@martin.st>
avcodec: add avcodec_enum_to_chroma_pos()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec: add avcodec_chroma_pos_to_enum()

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

* qatar/master:
  arm: Mangle external symbols properly in new vfp assembly files

See: 47d57f24e35f0e9694c615b81511dde4cda95c72
Merged-by: Michael Niedermayer <michaelni@gmx.at>
avformat/aviobuf/ffio_init_context: set seekable automatically

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avfilter: Dont partially merge lists

This prevents the unneeded insertion of multiple aresample filters in some cases

The format merging is moved to avoid having to call the channel layout
merge twice. The channel layout merge code uses different structures and
is not compatible with the added dry run wrappers.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avfilter/avfiltergraph: minor cosmetic

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/utils: use av_assert0() to check validity of input pointers for start code search

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