Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Oct 2013 17:37:16 +0000 (19:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Oct 2013 17:37:20 +0000 (19:37 +0200)
commitede7602cba81fd466b62aa812c2a0d0cd9c7c19d
tree9a1759273847292dc22676753ae639466d57a811
parentac3b01a9c0607961f4540fe62040833870f5deb1
parent3130416aecc8f3596f993d7768b0001ea2b85e24
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: add support for changing the channel by the C key
  ffplay: cycle through the streams of the current program, and not every stream
  ffplay: add null packet after attached pics packet
  ffplay: factor out putting null packet into the queue

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