]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 46a16ca 27b99d9)
Merge commit '27b99d929fe3440b4bba8e5d970c2802f274f328'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Feb 2015 21:03:42 +0000 (22:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Feb 2015 21:05:00 +0000 (22:05 +0100)
* commit '27b99d929fe3440b4bba8e5d970c2802f274f328':
  siff: Return more meaningful error values

Conflicts:
libavformat/siff.c

See: 29c3ebf56e2b54c68c52668937f74a874ecb49ac
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/siff.c patch | diff1 | diff2 | blob | history

diff --cc libavformat/siff.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.