diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-31 02:08:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-31 02:08:20 +0200 |
| commit | 40c29d42cfe5615b9e382b89f5bcba7a2d62cd29 (patch) | |
| tree | 8ccd01ce4ee2252abdb96388dff9ea71e9c4ff72 /libavcodec/iff.c | |
| parent | 3d0424f2ff3ae774d4237954186e4113976827e5 (diff) | |
| parent | f635a233e377bedc6a39c9d8923ee3039fa5319f (diff) | |
| download | ffmpeg-40c29d42cfe5615b9e382b89f5bcba7a2d62cd29.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
swscale: Remove unused variable.
ARM: simplify inline asm with 64-bit operands
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/iff.c')
0 files changed, 0 insertions, 0 deletions