[FFmpeg-cvslog] Merge commit '27b99d929fe3440b4bba8e5d970c2802f274f328'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb  3 22:03:42 2015 +0100| [deeba777ad0a0db018b1f93af32c5525a3a6a3a8] | committer: Michael Niedermayer

Merge commit '27b99d929fe3440b4bba8e5d970c2802f274f328'

* commit '27b99d929fe3440b4bba8e5d970c2802f274f328':
  siff: Return more meaningful error values

Conflicts:
	libavformat/siff.c

See: 29c3ebf56e2b54c68c52668937f74a874ecb49ac
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=deeba777ad0a0db018b1f93af32c5525a3a6a3a8
---