Michael Niedermayer 43bf4297e4 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  mpegaudioenc: Move some static tables to MpegAudioContext

Conflicts:
	libavcodec/mpegaudioenc.c
	libavcodec/mpegaudiotab.h

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

2013-11-11 22:21:38 +01:00

3.0 KiB

Raw Blame History

View Raw