diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-26 14:47:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-26 14:47:08 +0100 |
| commit | 325ee4ed7ad2aefb45c0f917285d04b3c3503f40 (patch) | |
| tree | b3d9e5677bb81d1983acf4b62af63157cc3b87b8 /.gitignore | |
| parent | 3a9f48f0337ddb51c167193548a635f68258b57d (diff) | |
| parent | f337c29017b10c98ccb4dce20efced4c74b665f6 (diff) | |
| download | ffmpeg-325ee4ed7ad2aefb45c0f917285d04b3c3503f40.tar.gz | |
Merge commit 'f337c29017b10c98ccb4dce20efced4c74b665f6'
* commit 'f337c29017b10c98ccb4dce20efced4c74b665f6':
eatgq: return meaningful error codes.
eatgv: cosmetics, reformat
Conflicts:
libavcodec/eatgq.c
libavcodec/eatgv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions