Michael Niedermayer 04fa818779 Merge commit '088f38a4f9f54bb923405c67c9e72d96d90aa284' ...

* commit '088f38a4f9f54bb923405c67c9e72d96d90aa284':
  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>

2013-05-01 18:16:32 +02:00

4.1 KiB

Raw Blame History

View Raw