eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-20 14:00:13 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
05cc8c8e4b7008ff3be8ec477c901b2ceca4b16b
ffmpeg/libavcodec/mpegaudiotab.h
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
Reference in New Issue View Git Blame Copy Permalink