diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-02 10:30:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-02 10:30:30 +0100 |
| commit | 1344c0453615a1f0141b11f5f4e3c640ee890afc (patch) | |
| tree | b89adf4ab7358fb23496c9469090dc19cc695dbd /libavcodec/webvttdec.c | |
| parent | 0b82fdcc469ec8f5dd4affe1fe5ae8710b373cd2 (diff) | |
| parent | dc6ea00cd2b91b591e6726e5bf1d5e03a4a9bdd0 (diff) | |
| download | ffmpeg-1344c0453615a1f0141b11f5f4e3c640ee890afc.tar.gz | |
Merge commit 'dc6ea00cd2b91b591e6726e5bf1d5e03a4a9bdd0'
* commit 'dc6ea00cd2b91b591e6726e5bf1d5e03a4a9bdd0':
mpeg4video: K&R formatting cosmetics
Conflicts:
libavcodec/mpeg4video.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/webvttdec.c')
0 files changed, 0 insertions, 0 deletions