diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-05 19:24:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-05 19:24:49 +0200 |
| commit | 1e4e760f767b597f88442b75e90d726ae626b230 (patch) | |
| tree | bbf016203da738a1f429becdc9e8568dd1b39aa1 /MAINTAINERS | |
| parent | 73aeb27cfe4ec51c2577097c980fe126dcd1908b (diff) | |
| parent | 213e606752d16f51337e94431962fb5d7749c07e (diff) | |
| download | ffmpeg-1e4e760f767b597f88442b75e90d726ae626b230.tar.gz | |
Merge commit '213e606752d16f51337e94431962fb5d7749c07e'
* commit '213e606752d16f51337e94431962fb5d7749c07e':
Replace av_unused attributes by block structures
Conflicts:
libavcodec/h264_loopfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'MAINTAINERS')
0 files changed, 0 insertions, 0 deletions