OSDN Git Service

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)
commitdc5f0018784895198919beb8a7bf47c423ed210f
treea531fca0beee5e9002be8b3decf519fd86fbe4a6
parente1ba29c76430ce511fd901c8b7a1bd199b169dc0
parentefe8a1ba08dd868e5a96f5759258b0733bb2004c
Merge remote-tracking branch 'cus/stable'

* 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>