ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Mon Mar 30 
20:54:08 2015 +0200| [847c0d333b6a195670f5bd64e9f7e5c9cf254cc4] | committer: 
Michael Niedermayer

Merge commit '6ed38b1f65b424a4fa92042e0069f350b95e0098'

* commit '6ed38b1f65b424a4fa92042e0069f350b95e0098':
  tiff: Return more meaningful error codes

Conflicts:
        libavcodec/tiffenc.c

See: 0187c2ccda3b00d22797170bf5675318dd0f675a
Merged-by: Michael Niedermayer <[email protected]>

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



_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to