ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sat Feb 14
22:40:35 2015 +0100| [d2223ec2bd36aae6a48c90bec3ebe4d0dc2eb421] | committer:
Michael Niedermayer
Merge commit '2a9c6fae927964b5dd0b5d3d9292f5621bd21664'
* commit '2a9c6fae927964b5dd0b5d3d9292f5621bd21664':
dca: Move all tables into dcadata.h
Conflicts:
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d2223ec2bd36aae6a48c90bec3ebe4d0dc2eb421
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
