diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 16:24:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 16:24:15 +0200 |
| commit | 0dd25e46996d648a7718c32e91cb5985b333963f (patch) | |
| tree | 35f433eb9cc11f59179ddc55690f8048c4c1b1a9 /libavfilter/buffersrc.c | |
| parent | 0e3d2b2c8d027182dfcd82cde8c986d8aab7add7 (diff) | |
| parent | b71a0507b01efdb5f783419df5e22e29678dc049 (diff) | |
| download | ffmpeg-0dd25e46996d648a7718c32e91cb5985b333963f.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: Remove unused inline asm instruction defines
vc1: Remove now unused variables
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/buffersrc.c')
0 files changed, 0 insertions, 0 deletions