ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Tue Nov 11
23:06:44 2014 +0100| [287eb69973f8066a68e924bdf9433b2faad01dfa] | committer:
Michael Niedermayer
Merge commit '443502aed8b814d883825e52e91e4f018955aa66'
* commit '443502aed8b814d883825e52e91e4f018955aa66':
dvbsubdec: move shared codepath
Conflicts:
libavcodec/dvbsubdec.c
The merged code is ignored and the factorization redone with
the code that is in FFmpeg.
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=287eb69973f8066a68e924bdf9433b2faad01dfa
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
