diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-21 14:54:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-21 14:55:21 +0200 |
| commit | 99ea47fe5a554126c2ddaccac42979e49d891aa4 (patch) | |
| tree | 19c39873be00641e8b9575c09981fdcf59d580d8 /libswscale/swscale_unscaled.c | |
| parent | 69fd0b7adbd22f24d45b6edb10eaf37d18c66bee (diff) | |
| parent | 4a2a4524a3f50ed302820ba971ddd48e78c7436f (diff) | |
| download | ffmpeg-99ea47fe5a554126c2ddaccac42979e49d891aa4.tar.gz | |
Merge commit '4a2a4524a3f50ed302820ba971ddd48e78c7436f'
* commit '4a2a4524a3f50ed302820ba971ddd48e78c7436f':
ffv1: propagate errors
Conflicts:
libavcodec/ffv1dec.c
libavcodec/ffv1enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/swscale_unscaled.c')
0 files changed, 0 insertions, 0 deletions