diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-03 04:13:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-03 04:13:37 +0200 |
| commit | feac9cbed0602503e9100dd2257ddc0d46e1929d (patch) | |
| tree | 44eff3a2070ec8642c071e7a5d34472466b46a64 /libavcodec/h261data.c | |
| parent | 5b58d79a99658200ee5562999b16b5a8fa729b22 (diff) | |
| parent | eda7571ea1a41c835e3a02fa9517e5bc67d7adce (diff) | |
| download | ffmpeg-feac9cbed0602503e9100dd2257ddc0d46e1929d.tar.gz | |
Merge commit 'eda7571ea1a41c835e3a02fa9517e5bc67d7adce'
* commit 'eda7571ea1a41c835e3a02fa9517e5bc67d7adce':
wmv2: K&R formatting cosmetics
Conflicts:
libavcodec/wmv2.c
libavcodec/wmv2dec.c
libavcodec/wmv2enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h261data.c')
0 files changed, 0 insertions, 0 deletions