ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sat Mar 21
23:13:25 2015 +0100| [a6cb0534e2b5e91c119c77165bc65a6ff14e649b] | committer:
Michael Niedermayer
Merge commit 'b53569e0681ff7bc99103ab4c961dbac3cc0fce6'
* commit 'b53569e0681ff7bc99103ab4c961dbac3cc0fce6':
h264_cabac: remove now unnecessary H264Context function parameters
Conflicts:
libavcodec/h264_cabac.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a6cb0534e2b5e91c119c77165bc65a6ff14e649b
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
