ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Mon Nov 24 
13:28:57 2014 +0100| [d2e0543766e0c8c077ab51495991f47066d9e768] | committer: 
Michael Niedermayer

Merge commit '0562887a984388fdc7a9b71c9374ff9c756fb4f1'

* commit '0562887a984388fdc7a9b71c9374ff9c756fb4f1':
  tiffenc: initialize return value

Conflicts:
        libavcodec/tiffenc.c

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

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



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

Reply via email to