diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-23 19:26:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-23 19:37:09 +0200 |
| commit | 4c18c31438d0f3357fc705b6d03d74728045a17f (patch) | |
| tree | ed06043e422f86fd37790429333d03094f5f5237 /COPYING.GPLv2 | |
| parent | 3a75c4e93b3b6f1aeb9343b933ff15776b5b4b41 (diff) | |
| parent | 1ce3ec24b35d9d549b12f17bd7fd391abaf3a6f7 (diff) | |
| download | ffmpeg-4c18c31438d0f3357fc705b6d03d74728045a17f.tar.gz | |
Merge commit '1ce3ec24b35d9d549b12f17bd7fd391abaf3a6f7'
* commit '1ce3ec24b35d9d549b12f17bd7fd391abaf3a6f7':
h263: K&R formatting cosmetics
Conflicts:
libavcodec/h263dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'COPYING.GPLv2')
0 files changed, 0 insertions, 0 deletions