diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-08 13:05:02 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-08 13:05:13 +0100 |
| commit | 48d30f6733368f317a61901c61a78a10402eea7b (patch) | |
| tree | 5e8c963e7256693f77c655f77addcfdb088e3460 /libavcodec/cga_data.c | |
| parent | 249fca3df9f9790369d38aaa63c828c3e2a30936 (diff) | |
| parent | 8729698d50739524665090e083d1bfdf28235724 (diff) | |
| download | ffmpeg-48d30f6733368f317a61901c61a78a10402eea7b.tar.gz | |
Merge commit '8729698d50739524665090e083d1bfdf28235724'
* commit '8729698d50739524665090e083d1bfdf28235724':
rtsp: Recheck the reordering queue if getting a new packet
lavr: log channel conversion description for any-to-any functions
lavr: mix: reduce the mixing matrix when possible
lavr: cosmetics: reindent
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cga_data.c')
0 files changed, 0 insertions, 0 deletions