diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-19 16:52:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-19 17:53:14 +0100 |
| commit | 2c6e693c975465691ced790ec52ef65588410117 (patch) | |
| tree | 915fa7fbf0173aa4426a8cf4460a44fc1ad76bae /libavcodec/siprdata.h | |
| parent | 18df75fa2fe2f4177d68715db65ff711475c1166 (diff) | |
| parent | d234c7a07c1313fd215e8e242492bf71f5f3321e (diff) | |
| download | ffmpeg-2c6e693c975465691ced790ec52ef65588410117.tar.gz | |
Merge commit 'd234c7a07c1313fd215e8e242492bf71f5f3321e'
* commit 'd234c7a07c1313fd215e8e242492bf71f5f3321e':
mpeg4videodec: K&R formatting cosmetics
Conflicts:
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/siprdata.h')
0 files changed, 0 insertions, 0 deletions