diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-15 15:16:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-15 15:16:45 +0100 |
| commit | 24d06cb2089fbe74912e82d613b8c166be1386a8 (patch) | |
| tree | 173d0b810ab897a0c27c1d4a70857189ac08f57d /libavcodec/g722.c | |
| parent | 353dbaa29714c9fb7d4b3ccc7e1b50569b0ea257 (diff) | |
| parent | 5e753ed502d3597077d8675ca1438e1bcade1459 (diff) | |
| download | ffmpeg-24d06cb2089fbe74912e82d613b8c166be1386a8.tar.gz | |
Merge commit '5e753ed502d3597077d8675ca1438e1bcade1459'
* commit '5e753ed502d3597077d8675ca1438e1bcade1459':
suncc: Replace more GCC flags by their equivalents in suncc_flags()
libtheoraenc: fix granularity of video quality
oggparsetheora: fix comment header parsing
h264: don't clobber mmco opcode tables for non-first slice headers.
Conflicts:
libavcodec/h264_refs.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g722.c')
0 files changed, 0 insertions, 0 deletions