diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-19 15:47:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-19 16:19:42 +0100 |
| commit | 18df75fa2fe2f4177d68715db65ff711475c1166 (patch) | |
| tree | 6b162743e3bf4d53ca5bc0d323e495c97b1e368c /libavcodec/resample.c | |
| parent | 3033cd7555921242cbdc06d0d8aee9f8925d6a3c (diff) | |
| parent | 8769113accf1f3b78634dec60b37f7354ed6d88d (diff) | |
| download | ffmpeg-18df75fa2fe2f4177d68715db65ff711475c1166.tar.gz | |
Merge commit '8769113accf1f3b78634dec60b37f7354ed6d88d'
* commit '8769113accf1f3b78634dec60b37f7354ed6d88d':
mpeg4videoenc: K&R formatting cosmetics
Conflicts:
libavcodec/mpeg4videoenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/resample.c')
0 files changed, 0 insertions, 0 deletions