diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-28 22:40:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-28 22:40:53 +0200 |
| commit | 95cf5e83a750fb886eb8c509e0f907eabda96d1a (patch) | |
| tree | 3ee147797375df9e2206d79f7149a9bc94a31c31 /libavformat/cdg.c | |
| parent | e4e64f2fea0a0a1ba8eb89f0f6fa1930ff1ec389 (diff) | |
| parent | 4dc0fbb13c33b4e5bdb766652f4daf900ccc952f (diff) | |
| download | ffmpeg-95cf5e83a750fb886eb8c509e0f907eabda96d1a.tar.gz | |
Merge commit '4dc0fbb13c33b4e5bdb766652f4daf900ccc952f' into release/2.4
* commit '4dc0fbb13c33b4e5bdb766652f4daf900ccc952f':
x86: cavs: Remove an unneeded scratch buffer
Conflicts:
libavcodec/x86/cavsdsp.c
See: d79f7bf0d63a81ee66026ee92a6946a7303d04bd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/cdg.c')
0 files changed, 0 insertions, 0 deletions