diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-07 01:00:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-07 01:01:13 +0100 |
| commit | d30660306ceb070a3d74bca3b4a9f99a09b685dc (patch) | |
| tree | 1b9e692b389a890a3f61be07b388e31e6f64cad3 /libavfilter/vf_overlay.c | |
| parent | 07f22d0b49332d9616ce5ff94679da5a01c19b0d (diff) | |
| parent | 3c6e5a840c45fd3b832e86881602a72e47d46f19 (diff) | |
| download | ffmpeg-d30660306ceb070a3d74bca3b4a9f99a09b685dc.tar.gz | |
Merge commit '3c6e5a840c45fd3b832e86881602a72e47d46f19'
* commit '3c6e5a840c45fd3b832e86881602a72e47d46f19':
rl2: use fixed-width integer types where appropriate
rl2: return meaningful error codes.
cljr: return a meaningful error code.
fraps: cosmetics, reformat
Conflicts:
libavcodec/fraps.c
libavcodec/rl2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_overlay.c')
0 files changed, 0 insertions, 0 deletions