diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-19 14:55:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-19 14:55:58 +0200 |
| commit | c9fe864472a2c55c7c4189ff6fb490bec8bd92b3 (patch) | |
| tree | e6b713039096a079b01f66237e8516bdee893f2d /libavcodec/mpegaudio.c | |
| parent | 5980e57cf9a08ca284bc1b5ffba2363f9eff8ca8 (diff) | |
| parent | 4855022aa11ec7aa1a3bd9797814e84795634abe (diff) | |
| download | ffmpeg-c9fe864472a2c55c7c4189ff6fb490bec8bd92b3.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vorbisdec: remove some pointless comments
avprobe: add const to AVCodec pointer
libavformat: add const to AVCodec pointers
pthread: add const to AVCodec pointers
Conflicts:
ffprobe.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegaudio.c')
0 files changed, 0 insertions, 0 deletions