diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-28 12:03:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-28 12:03:41 +0200 |
| commit | 5fd254c4f6db58b74a02a38f0d724e5fdc149d88 (patch) | |
| tree | cd162651ec22bf158e21a7f8640feda54d0eb3c6 /MAINTAINERS | |
| parent | 54056c149333034414b86b6771692ea5862862d4 (diff) | |
| parent | 26a44143efb513a602542fb59aee87b1fc62af51 (diff) | |
| download | ffmpeg-5fd254c4f6db58b74a02a38f0d724e5fdc149d88.tar.gz | |
Merge commit '26a44143efb513a602542fb59aee87b1fc62af51'
* commit '26a44143efb513a602542fb59aee87b1fc62af51':
avplay: remove a warning
Conflicts:
ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'MAINTAINERS')
0 files changed, 0 insertions, 0 deletions