Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: remove an unused static constant

Merge only for metadata as the constant us not unused in ffmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-09-20 16:08:19 +02:00
commit bed611f937

Diff Content Not Available