diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-04 20:00:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-04 20:09:01 +0200 |
| commit | ddc6adaa280aecd973cc3cc1661f8bafe28738c8 (patch) | |
| tree | c22b0d45a9e930bf1d7d52f77d13d6dcf64d7695 /MAINTAINERS | |
| parent | 5a20f1885d3b521afc8c63734cff724da0a87815 (diff) | |
| parent | 4d55e9de27894ddfb337b28cd7aa6d14a12666d2 (diff) | |
| download | ffmpeg-ddc6adaa280aecd973cc3cc1661f8bafe28738c8.tar.gz | |
Merge commit '4d55e9de27894ddfb337b28cd7aa6d14a12666d2'
* commit '4d55e9de27894ddfb337b28cd7aa6d14a12666d2':
vc1: Split bits used in libavformat into a separate header
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'MAINTAINERS')
0 files changed, 0 insertions, 0 deletions