diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-06 13:00:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-06 13:00:47 +0200 |
| commit | 2a27e5255071e2bac7f78f484c528d0810be73a0 (patch) | |
| tree | 1dbda94e03f632ad22be3fef1bcac29aeb1cb446 /libavformat/hlsproto.c | |
| parent | 61845dc74afce9c33583eb1d0ed82c115ff61d4b (diff) | |
| parent | 7f93a861aaf2e76fd63b53ccc465909873b8dc29 (diff) | |
| download | ffmpeg-2a27e5255071e2bac7f78f484c528d0810be73a0.tar.gz | |
Merge commit '7f93a861aaf2e76fd63b53ccc465909873b8dc29'
* commit '7f93a861aaf2e76fd63b53ccc465909873b8dc29':
mpeg12enc: K&R formatting cosmetics
Conflicts:
libavcodec/mpeg12enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/hlsproto.c')
0 files changed, 0 insertions, 0 deletions