diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-03 17:41:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-03 17:41:17 +0200 |
| commit | b0dc4286a960a8a6e87ef7904006f7948a5af6b0 (patch) | |
| tree | d1d90bc46d022d4cb070f9f7696712d3a66c0e12 /COPYING.LGPLv3 | |
| parent | 5d5583038866cbc2280b893c39e1885d77fdf243 (diff) | |
| parent | eb239a577fcf1f19cdaa7aeb6e6586a172ee59c1 (diff) | |
| download | ffmpeg-streaming-b0dc4286a960a8a6e87ef7904006f7948a5af6b0.zip ffmpeg-streaming-b0dc4286a960a8a6e87ef7904006f7948a5af6b0.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: avcodec: order cosmetics
intrax8dsp: Add missing #include to make header standalone
Delete motion-test tool; it is of doubtful utility.
Conflicts:
libavcodec/Makefile
libavcodec/motion-test.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'COPYING.LGPLv3')
0 files changed, 0 insertions, 0 deletions
