Merge commit '1ce3ec24b35d9d549b12f17bd7fd391abaf3a6f7'
* commit '1ce3ec24b35d9d549b12f17bd7fd391abaf3a6f7': h263: K&R formatting cosmetics Conflicts: libavcodec/h263dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
4c18c31438
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user