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)
* 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>
1  2 
ffplay.c

diff --cc ffplay.c
Simple merge