Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 11 Nov 2013 21:21:38 +0000 (22:21 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 11 Nov 2013 21:21:38 +0000 (22:21 +0100)
commit43bf4297e4db95be5901c04ec8e89901c187b01d
tree972027c051776df10076a349d90cd0999db26685
parentafc660ab9bdfde49be14bcf9ddb38e3688a07511
parent45ef963908f5ccc63161d4c3479ba8f2a56a7705
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>
libavcodec/mpegaudioenc.c
libavcodec/mpegaudiotab.h