diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-17 13:28:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-17 13:28:50 +0200 |
| commit | ee73a69020a8343e827a21a0de92ca1b05f89588 (patch) | |
| tree | c1589f4d4269667a6b10d7c04574105e7962c5db /Changelog | |
| parent | 019ff7a0c37a25068c99b7b72cc9650a2a47863e (diff) | |
| parent | e58a140cf91d1a9cdfa3115d73c923dab0e9e7dc (diff) | |
| download | ffmpeg-ee73a69020a8343e827a21a0de92ca1b05f89588.tar.gz | |
Merge commit 'e58a140cf91d1a9cdfa3115d73c923dab0e9e7dc'
* commit 'e58a140cf91d1a9cdfa3115d73c923dab0e9e7dc':
avplay: Always free opts
Conflicts:
ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Changelog')
0 files changed, 0 insertions, 0 deletions