diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-26 15:19:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-26 15:19:48 +0100 |
| commit | 8ab97a60ef949f9f2cc0de768143c3ce89a1aabf (patch) | |
| tree | 774977e67d24d31e78d11b94b595507beec318d2 /arch.mak | |
| parent | c0c06c1bba80c4bee162a3c40eec678ddc65571d (diff) | |
| parent | a0cabd0a27587525e90a44660c795d40d2f44fe2 (diff) | |
| download | ffmpeg-8ab97a60ef949f9f2cc0de768143c3ce89a1aabf.tar.gz | |
Merge commit 'a0cabd0a27587525e90a44660c795d40d2f44fe2'
* commit 'a0cabd0a27587525e90a44660c795d40d2f44fe2':
mimic: cosmetics, reformat
iff: drop ff_ prefix from a static function.
pngdec: cosmetics, reformat.
dxa: return meaningful error codes.
eatgq: cosmetics, reformat.
Conflicts:
libavcodec/dxa.c
libavcodec/eatgq.c
libavcodec/iff.c
libavcodec/mimic.c
libavcodec/pngdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'arch.mak')
0 files changed, 0 insertions, 0 deletions