Changeset 444ce03f in ffmpeg

Timestamp:

Oct 26, 2013, 11:54:29 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

99a4c86a

Parents:

fcd08b77 (diff), 44758b4d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (10/26/13 11:54:25)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (10/26/13 11:54:29)

Message:

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>

(No files)