[FFmpeg-devel] [PATCHv2] ffplay: update documentation

[Michael Niedermayer]

On Sat, Oct 18, 2014 at 01:22:03AM +0200, Marton Balint wrote:
> 
> On Thu, 16 Oct 2014, Lou Logan wrote:
> 
> >On Wed, 15 Oct 2014 23:46:21 +0200, Marton Balint wrote:
> >
> >>Thank you for all your feedback, apparently there was some confusion because I
> >>have used "set" both as a synonym to "enabled" and as an imperative. I have
> >>changed all occurences of it to "enabled" or "use", so hopefully it will be
> >>more clear now. I have also done minor modifications in the text mostly based
> >>on your comments.
> >>
> >>Here is v2 of the patch.
> >>
> >>---
> >>
> >>Signed-off-by: Marton Balint <cus at passwd.hu>
> >>---
> >> doc/ffplay.texi | 26 ++++++++++++++++++++------
> >> 1 file changed, 20 insertions(+), 6 deletions(-)
> >
> >Docs LGTM.
> 
> Hi Michael,
> 
> Please merge from my stable branch for this patch and the rest of
> the pending ffplay patches:
> 
> 9dac797 ffplay: remove delays when paused from video and subtitle thread
> 0edf3e7 ffplay: remove manual bug option handling code
> 2c4d6a3 ffplay: update documentation

merged

thanks
[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

You can kill me, but you cannot change the truth.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20141018/7182cf55/attachment.asc>