Merge commit '26a44143efb513a602542fb59aee87b1fc62af51'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 28 Apr 2013 10:03:41 +0000 (12:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 28 Apr 2013 10:03:41 +0000 (12:03 +0200)
commit5fd254c4f6db58b74a02a38f0d724e5fdc149d88
treecd162651ec22bf158e21a7f8640feda54d0eb3c6
parent54056c149333034414b86b6771692ea5862862d4
parent26a44143efb513a602542fb59aee87b1fc62af51
Merge commit '26a44143efb513a602542fb59aee87b1fc62af51'

* commit '26a44143efb513a602542fb59aee87b1fc62af51':
  avplay: remove a warning

Conflicts:
ffplay.c

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