ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Tue Feb 17
23:34:36 2015 +0100| [d06dce21a454f541acec329aa5299e67cd9d0994] | committer:
Michael Niedermayer
Merge commit '42c8f92e2fa390fa17b03d37b4323ec0d721d4cd'
* commit '42c8f92e2fa390fa17b03d37b4323ec0d721d4cd':
wmv2: Return meaningful error codes
Conflicts:
libavcodec/wmv2dec.c
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d06dce21a454f541acec329aa5299e67cd9d0994
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
