Merge commit 'e58a140cf91d1a9cdfa3115d73c923dab0e9e7dc'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Oct 2014 11:28:50 +0000 (13:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Oct 2014 11:28:50 +0000 (13:28 +0200)
commitee73a69020a8343e827a21a0de92ca1b05f89588
treec1589f4d4269667a6b10d7c04574105e7962c5db
parent019ff7a0c37a25068c99b7b72cc9650a2a47863e
parente58a140cf91d1a9cdfa3115d73c923dab0e9e7dc
Merge commit 'e58a140cf91d1a9cdfa3115d73c923dab0e9e7dc'

* commit 'e58a140cf91d1a9cdfa3115d73c923dab0e9e7dc':
  avplay: Always free opts

Conflicts:
ffplay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffplay.c