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)
commit444ce03f0f15024f596e42753343455291f2b558
tree53fbffe8a22019e2ecd4b36ec23ad07ffd77a096
parentfcd08b77705997f39f88eab268639c2b76cbc6b1
parent44758b4d17f6bcdfca74d329ad2fcff3e930bdbd
Merge remote-tracking branch 'cus/stable'

* 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>