diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-14 20:29:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-14 20:29:34 +0100 |
| commit | 4177f501b433a59edcdb8368f02082514f55f580 (patch) | |
| tree | 424acd87ff514a083ea37653e0467b01e03af57b /ffmpeg.h | |
| parent | 3eec775b211c5fd00300e2042ae8f116293e5d55 (diff) | |
| parent | 7769be590c7aeb2aad26ca723d105cf5203e33d2 (diff) | |
| download | ffmpeg-4177f501b433a59edcdb8368f02082514f55f580.tar.gz | |
Merge commit '7769be590c7aeb2aad26ca723d105cf5203e33d2'
* commit '7769be590c7aeb2aad26ca723d105cf5203e33d2':
vp56: Return meaningful error codes
Conflicts:
libavcodec/vp56.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.h')
0 files changed, 0 insertions, 0 deletions