From: Michael Niedermayer Date: Sun, 13 Oct 2013 17:37:16 +0000 (+0200) Subject: Merge remote-tracking branch 'cus/stable' X-Git-Tag: android-x86-4.4-r1~629 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ede7602cba81fd466b62aa812c2a0d0cd9c7c19d;p=android-x86%2Fexternal-ffmpeg.git 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 --- ede7602cba81fd466b62aa812c2a0d0cd9c7c19d