Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Feb 2014 14:42:50 +0000 (15:42 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Feb 2014 14:43:03 +0000 (15:43 +0100)
commitc427b2b86e726159873eb6cc4f7153c5bd778c55
treebf84ff8620f5b1940aa8af20e0c5478267f59955
parentadd54280bfc101b842959e5fb96260cdb0882954
parent4bcca3611da24583dfbb8a1cc4c404a7deaa5590
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpeg4video_parser: Drop pointless av_-prefix from static function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpeg4video_parser.c