diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-01 15:11:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-01 15:11:05 +0200 |
| commit | ad99837b638f1271da37dbe75d409b1350ad556e (patch) | |
| tree | 40bdfb426c9f372de95ca17bc8066ca1163eb2e0 /libavfilter/buffersrc.c | |
| parent | 713dbe0655e4c3a906b0d812a6f90ac161223876 (diff) | |
| parent | 03c9f357a4c2307a7913cea2cbf0ba817e80beb6 (diff) | |
| download | ffmpeg-ad99837b638f1271da37dbe75d409b1350ad556e.tar.gz | |
Merge commit '03c9f357a4c2307a7913cea2cbf0ba817e80beb6'
* commit '03c9f357a4c2307a7913cea2cbf0ba817e80beb6':
ppc: idctdsp: Immediately return if no AltiVec is available
Conflicts:
libavcodec/ppc/idctdsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/buffersrc.c')
0 files changed, 0 insertions, 0 deletions