Merge commit 'cf83c0173917a44b89a25ea2b435429bbf9ee767'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Oct 2014 11:17:05 +0000 (13:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Oct 2014 11:17:05 +0000 (13:17 +0200)
commit019ff7a0c37a25068c99b7b72cc9650a2a47863e
tree6af3c8f8c77fec2140bbf01e5f19a59a6ceb9646
parentc40a1bd253f673d821a5df2a7a863a1837446123
parentcf83c0173917a44b89a25ea2b435429bbf9ee767
Merge commit 'cf83c0173917a44b89a25ea2b435429bbf9ee767'

* commit 'cf83c0173917a44b89a25ea2b435429bbf9ee767':
  avplay: Always free find_stream_info options

Conflicts:
ffplay.c

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