diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 14:21:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 14:22:35 +0100 |
| commit | 2d4b8af4f6883fad76f45c33466bd86b35f1c3eb (patch) | |
| tree | 2727d0126d551e007881af6f8b0b63e8fa2afc5d /libavformat/avienc.c | |
| parent | 4e40e6128769246ee101e1990be42880a07dda18 (diff) | |
| parent | b82722df9b2911bd41e0928db4804067b39e6528 (diff) | |
| download | ffmpeg-2d4b8af4f6883fad76f45c33466bd86b35f1c3eb.tar.gz | |
Merge commit 'b82722df9b2911bd41e0928db4804067b39e6528'
* commit 'b82722df9b2911bd41e0928db4804067b39e6528':
hevc: reindent after previous commit
Conflicts:
libavcodec/hevc.c
See: f8ecffa9b7e49860ce030fb3cabb60b3143384db
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avienc.c')
0 files changed, 0 insertions, 0 deletions