diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-03 11:53:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-03 11:53:05 +0200 |
| commit | 45a73d2b472ffcc0d87f3efae3424c44976d6935 (patch) | |
| tree | 454bf430eab79d20b8a7c4ac609ee70260188a16 /ffmpeg.c | |
| parent | 7cb5467a52011d194289035b51e27c4df80bf2a2 (diff) | |
| parent | c011ceef78eae66039efc66d9551a7146e08838a (diff) | |
| download | ffmpeg-45a73d2b472ffcc0d87f3efae3424c44976d6935.tar.gz | |
Merge commit 'c011ceef78eae66039efc66d9551a7146e08838a'
* commit 'c011ceef78eae66039efc66d9551a7146e08838a':
swscale: ppc: Remove commented-out define cruft
nsvdec: Remove commented-out debug cruft
cpu: Restructure code to avoid pointless ret variable indirection
Conflicts:
libavutil/cpu.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions