diff options
| author | Michael Niedermayer <[email protected]> | 2013-11-23 12:01:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-11-23 12:10:40 +0100 |
| commit | 8733b363ac3b2b6e043c3df3d37e4a0258134f4f (patch) | |
| tree | 8eca541026dcf488e722604874933d5a54ec7c52 /libavformat/ircamenc.c | |
| parent | 97a0bad87c8d05a3b428e33289efdb18757c47ce (diff) | |
| parent | c16bfb147df8a9d350e8a0dbc01937b78faf5949 (diff) | |
Merge commit 'c16bfb147df8a9d350e8a0dbc01937b78faf5949'
* commit 'c16bfb147df8a9d350e8a0dbc01937b78faf5949':
swscale: x86: Consistently use lowercase function name suffixes
Conflicts:
libswscale/x86/rgb2rgb.c
libswscale/x86/swscale.c
See: 1de064e21e7f1bbdd2347ba8967089a18669fcf8
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/ircamenc.c')
0 files changed, 0 insertions, 0 deletions