diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-07 01:30:23 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-07 01:30:23 +0100 |
commit | 55d8cac254ee2aeba051810ca92bb868fcbd8468 (patch) | |
tree | fefc7eff8028c9c7df0451625f766c1d4dc7fd87 /ffmpeg.c | |
parent | 501db2f32babff8e2851ffd7aeb6bcb1ecb47d19 (diff) | |
parent | 6689474b91049411b5b7986616d1c66b701ae11f (diff) | |
download | ffmpeg-55d8cac254ee2aeba051810ca92bb868fcbd8468.tar.gz |
Merge commit '6689474b91049411b5b7986616d1c66b701ae11f'
* commit '6689474b91049411b5b7986616d1c66b701ae11f':
v210x: return meaningful error codes.
r210dec: return meaningful error codes.
vb: cosmetics, reformat
Conflicts:
libavcodec/vb.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions