diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-11 22:21:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-11 22:21:38 +0100 |
| commit | 43bf4297e4db95be5901c04ec8e89901c187b01d (patch) | |
| tree | 972027c051776df10076a349d90cd0999db26685 /libavdevice/libcdio.c | |
| parent | afc660ab9bdfde49be14bcf9ddb38e3688a07511 (diff) | |
| parent | 45ef963908f5ccc63161d4c3479ba8f2a56a7705 (diff) | |
| download | ffmpeg-43bf4297e4db95be5901c04ec8e89901c187b01d.tar.gz | |
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>
Diffstat (limited to 'libavdevice/libcdio.c')
0 files changed, 0 insertions, 0 deletions