[FFmpeg-devel] [PATCH v7] Add SUP/PGS subtitle demuxer

[Clément Bœsch]

On Wed, Sep 24, 2014 at 05:38:58PM +0200, wm4 wrote:
> ---
> doc reference, bump minor, no other changes
> ---
>  doc/general.texi         |   1 +
>  libavformat/Makefile     |   1 +
>  libavformat/allformats.c |   1 +
>  libavformat/supdec.c     | 109 +++++++++++++++++++++++++++++++++++++++++++++++
>  libavformat/version.h    |   4 +-
>  5 files changed, 114 insertions(+), 2 deletions(-)
>  create mode 100644 libavformat/supdec.c
> 

Thanks, applied with a few trivial changes such as adding Changelog entry
(see also below)

> diff --git a/doc/general.texi b/doc/general.texi
> index 8d7555d..7f6fb86 100644
> --- a/doc/general.texi
> +++ b/doc/general.texi
> @@ -453,6 +453,7 @@ library:
>  @item Sony PlayStation STR      @tab   @tab X
>  @item Sony Wave64 (W64)         @tab X @tab X
>  @item SoX native format         @tab X @tab X

> + at item SUP raw PGS subtitles     @tab   @tab X
>  @item SUN AU format             @tab X @tab X

both swapped (as noticed by Compn)

[...]
> +static int sup_read_packet(struct AVFormatContext *s, AVPacket *pkt)

"struct" dropped

[...]
> diff --git a/libavformat/version.h b/libavformat/version.h
> index 61decb9..b1dde2c 100644
> --- a/libavformat/version.h
> +++ b/libavformat/version.h
> @@ -30,8 +30,8 @@
>  #include "libavutil/version.h"
>  
>  #define LIBAVFORMAT_VERSION_MAJOR 56
> -#define LIBAVFORMAT_VERSION_MINOR  4
> -#define LIBAVFORMAT_VERSION_MICRO 103
> +#define LIBAVFORMAT_VERSION_MINOR  5
> +#define LIBAVFORMAT_VERSION_MICRO 100

rebased to current

[...]

Thank you for the patch. Looking forward the muxer, and a FATE test.

-- 
Clément B.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 473 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20140926/f089547d/attachment.asc>