Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 14 Dec 2011 21:31:42 +0000 (22:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 14 Dec 2011 21:31:47 +0000 (22:31 +0100)
* cus/stable:
  ffplay: clear pkt_temp when pkt is freed.
  ffplay: Fix got_frame type.
  ffplay: add 10 minute seek support to ffplay
  ffplay: force setting video mode on fullscreen toggle

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

Trivial merge