Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Mar 2013 04:24:35 +0000 (05:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Mar 2013 04:24:41 +0000 (05:24 +0100)
commit9f95e355be16150a2bc00145d5a72e2a5e017b29
tree708996190fa0557091fbb6b6d4a848316175b47d
parent0f95534669a114539e410b05fde6dea3c5cfe19a
parente96175ad7b576ad57b83d399193ef10b2bb016ae
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: add -af option
  ffplay: use refcounted frames for audio
  ffplay: use frame->pts if available for setting the audio clock
  ffplay: restructure audio stream opening code

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