ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Mon Apr 20
04:29:58 2015 +0200| [73e6af9d7b56f12d8676ff919f4acc6c9991d985] | committer:
Michael Niedermayer
Merge commit '17aa81d94781c6f62dc7d1dbd1f8891c020c9905'
* commit '17aa81d94781c6f62dc7d1dbd1f8891c020c9905':
hqx: Merge invalid format check within switch block
Conflicts:
libavcodec/hqx.c
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=73e6af9d7b56f12d8676ff919f4acc6c9991d985
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
