Merge commit '95baf701'

* commit '95baf701': svq1: deMpegEncContextize Conflicts: libavcodec/svq1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '95baf701'
* commit '95baf701': svq1: deMpegEncContextize Conflicts: libavcodec/svq1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
e7f255d8 · Michael Niedermayer · db6e9604 · 95baf701 · e7f255d8
Commit e7f255d8 authored Dec 13, 2012 by Michael Niedermayer
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 112 additions and 71 deletions

svq1dec.c libavcodec/svq1dec.c +112 -71

No files found.
--- a/libavcodec/svq1dec.c
+++ b/libavcodec/svq1dec.c