diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-11 17:47:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-11 17:59:21 +0200 |
| commit | 6530e2ff0cd011ee3b87bd8d77c964a41f6b44ec (patch) | |
| tree | d28d48e2e8f7a143075445d22bf1051a811ddffe /libavcodec/adx.c | |
| parent | d6bcdf0dcdd7711fa0419b8d4baee8316638120f (diff) | |
| parent | 7a9b764c0737f42cf2458c3c5378b0df216e14a2 (diff) | |
| download | ffmpeg-6530e2ff0cd011ee3b87bd8d77c964a41f6b44ec.tar.gz | |
Merge commit '7a9b764c0737f42cf2458c3c5378b0df216e14a2'
* commit '7a9b764c0737f42cf2458c3c5378b0df216e14a2':
libdc1394: Unbreak build after c201069fa
See: fe25194c5870f21ba10f615f036b64d0c84fca48
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/adx.c')
0 files changed, 0 insertions, 0 deletions