diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-15 13:41:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-15 13:41:06 +0100 |
| commit | f186ecc164e8dad145d4637ac1d55b66e460af7a (patch) | |
| tree | b14e6d2d85dd3589c4a4cc5bb5c730976d9df854 /libavfilter/vf_overlay.c | |
| parent | 75b7e543df05e9d4dfb1f73a28bceecd0bd1971b (diff) | |
| parent | bb675d3ac6d722d5e117ae9042a996b55ca05b1d (diff) | |
| download | ffmpeg-f186ecc164e8dad145d4637ac1d55b66e460af7a.tar.gz | |
Merge commit 'bb675d3ac6d722d5e117ae9042a996b55ca05b1d'
* commit 'bb675d3ac6d722d5e117ae9042a996b55ca05b1d':
vp56: make parse_header return standard error codes
Conflicts:
libavcodec/vp56.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_overlay.c')
0 files changed, 0 insertions, 0 deletions