diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-26 15:42:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-26 15:42:29 +0100 |
| commit | 8380fc88845ef92e16d54df582519284062b199d (patch) | |
| tree | 0e1b6bec69063c05fce5b457a903be6e9577bda0 /libswresample | |
| parent | 8ab97a60ef949f9f2cc0de768143c3ce89a1aabf (diff) | |
| parent | 7bcaeb408e3eb2d2f37a306009fa7fe7eb0f1d79 (diff) | |
| download | ffmpeg-8380fc88845ef92e16d54df582519284062b199d.tar.gz | |
Merge commit '7bcaeb408e3eb2d2f37a306009fa7fe7eb0f1d79'
* commit '7bcaeb408e3eb2d2f37a306009fa7fe7eb0f1d79':
mjpegdec: fix indentation
rawdec: cosmetics, reformat
mimic: return meaningful error codes.
Conflicts:
libavcodec/mjpegdec.c
libavcodec/rawdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
0 files changed, 0 insertions, 0 deletions