[FFmpeg-devel] [PATCH 1/4] ffplay: update and extend documentation for channel and stream switching

[Marton Balint]

On Thu, 24 Oct 2013, Michael Niedermayer wrote:

> On Thu, Oct 24, 2013 at 01:36:56AM +0200, Marton Balint wrote:
>> Signed-off-by: Marton Balint <cus at passwd.hu>
>> ---
>>  doc/ffplay.texi | 7 +++++--
>>  ffplay.c        | 4 ++--
>>  2 files changed, 7 insertions(+), 4 deletions(-)
>
> LGTM
>

Hi Michael,

Please merge from ffplay stable for the patch series:

060c42b ffplay: update and extend documentation for channel and stream switching
2d059d8 ffplay: factor out picture freeing code
04de0e0 ffplay: use av_frame_get_pkt_pos instead directly accessing pkt pos
44758b4 ffplay: add support for libswresample options

Thanks,
Marton