diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-03 22:03:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-03 22:05:00 +0100 |
| commit | deeba777ad0a0db018b1f93af32c5525a3a6a3a8 (patch) | |
| tree | 170bc2ced18155c0d8fee582118f1d1db5b241a4 /libavcodec | |
| parent | 46a16ca15a68bfd7341dd9783ecf39bbdf80d08e (diff) | |
| parent | 27b99d929fe3440b4bba8e5d970c2802f274f328 (diff) | |
| download | ffmpeg-deeba777ad0a0db018b1f93af32c5525a3a6a3a8.tar.gz | |
Merge commit '27b99d929fe3440b4bba8e5d970c2802f274f328'
* commit '27b99d929fe3440b4bba8e5d970c2802f274f328':
siff: Return more meaningful error values
Conflicts:
libavformat/siff.c
See: 29c3ebf56e2b54c68c52668937f74a874ecb49ac
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
0 files changed, 0 insertions, 0 deletions