diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-04 13:19:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-04 13:19:54 +0100 |
| commit | d8e65e9224b9234e3b0baaa916bc9c9bdbb34eb6 (patch) | |
| tree | 6cc7cb4c8d70f88b58e96cdcfb732cabd98c0a16 /ffmpeg_filter.c | |
| parent | 63ce041a7d06d9b411ab148289e1af9a407dfaea (diff) | |
| parent | 3348e3492d0cf605361bacce28b3ddb02e1b563f (diff) | |
| download | ffmpeg-d8e65e9224b9234e3b0baaa916bc9c9bdbb34eb6.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
arm: Use the matching endfunc macro instead of the assembler directive directly
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_filter.c')
0 files changed, 0 insertions, 0 deletions