-
Michael Niedermayer authored
* qatar/master: mpegaudioenc: Move some static tables to MpegAudioContext Conflicts: libavcodec/mpegaudioenc.c libavcodec/mpegaudiotab.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
43bf4297
* qatar/master:
mpegaudioenc: Move some static tables to MpegAudioContext
Conflicts:
libavcodec/mpegaudioenc.c
libavcodec/mpegaudiotab.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>