* commit '088f38a4':
  avcodec: Drop unnecessary ff_ name prefixes from static functions

Conflicts:
	libavcodec/ass.c
	libavcodec/h264_parser.c
	libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>