Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Oct 2013 11:54:25 +0000 (13:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Oct 2013 11:54:29 +0000 (13:54 +0200)
* cus/stable:
  ffplay: add support for libswresample options
  ffplay: use av_frame_get_pkt_pos instead directly accessing pkt pos
  ffplay: factor out picture freeing code
  ffplay: update and extend documentation for channel and stream switching

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

Trivial merge