diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-02 10:19:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-02 10:19:12 +0100 |
| commit | 0b82fdcc469ec8f5dd4affe1fe5ae8710b373cd2 (patch) | |
| tree | a6ca9af5906795f8d523e8c54f45bee5823e6b3c /libavcodec/h264pred.h | |
| parent | 7146eacfc5f20dea719d6581d72b7532ab39688d (diff) | |
| parent | 037fea388e0df2a22441bc1ed86794152161baf1 (diff) | |
| download | ffmpeg-0b82fdcc469ec8f5dd4affe1fe5ae8710b373cd2.tar.gz | |
Merge commit '037fea388e0df2a22441bc1ed86794152161baf1'
* commit '037fea388e0df2a22441bc1ed86794152161baf1':
flashsv: K&R formatting cosmetics
Conflicts:
libavcodec/flashsv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264pred.h')
0 files changed, 0 insertions, 0 deletions