Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Feb 2013 15:14:15 +0000 (16:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Feb 2013 15:14:21 +0000 (16:14 +0100)
commit4be0b9109421b87f049cab9aa8f46d94f5403c08
tree0c4b8e9a35b616d473522b8104ab2f6841fb0393
parent6d9c21dc0e82130bcd57f77c5ba11d260075a004
parent4ea7fbb2ec1a8833b6683655b98f4bf42f817102
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: step to next frame if paused when seeking
  ffplay: move up pause functions
  ffplay: remember last window dimensions
  ffplay: fix order of setting show_mode
  ffplay: dynamically allocate audio buffer

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