Re: [FFmpeg-devel] [PATCH 1/3] avformat/ffmdec: Add cleaner API for ffserver to interface without depending on internal ABI

2015-11-20 Thread Andreas Cadhalpun 
On 20.11.2015 03:26, Michael Niedermayer wrote:
> From: Michael Niedermayer 
> 
> Signed-off-by: Michael Niedermayer 
> ---
>  libavformat/ffm.h |2 ++
>  libavformat/ffmdec.c  |   14 ++
>  libavformat/version.h |2 +-
>  3 files changed, 17 insertions(+), 1 deletion(-)
> 

This looks good.

> diff --git a/libavformat/version.h b/libavformat/version.h
> index 55198e7..d66eeff 100644
> --- a/libavformat/version.h
> +++ b/libavformat/version.h
> @@ -30,7 +30,7 @@
>  #include "libavutil/version.h"
>  
>  #define LIBAVFORMAT_VERSION_MAJOR  57
> -#define LIBAVFORMAT_VERSION_MINOR  15
> +#define LIBAVFORMAT_VERSION_MINOR  16
>  #define LIBAVFORMAT_VERSION_MICRO 100
>  
>  #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
> 

Only MINOR is already at 16 now.

Best regards,
Andreas
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH 1/3] avformat/ffmdec: Add cleaner API for ffserver to interface without depending on internal ABI

2015-11-20 Thread Michael Niedermayer 
On Fri, Nov 20, 2015 at 07:33:20PM +0100, Andreas Cadhalpun wrote:
> On 20.11.2015 03:26, Michael Niedermayer wrote:
> > From: Michael Niedermayer 
> > 
> > Signed-off-by: Michael Niedermayer 
> > ---
> >  libavformat/ffm.h |2 ++
> >  libavformat/ffmdec.c  |   14 ++
> >  libavformat/version.h |2 +-
> >  3 files changed, 17 insertions(+), 1 deletion(-)
> > 
> 
> This looks good.
> 
> > diff --git a/libavformat/version.h b/libavformat/version.h
> > index 55198e7..d66eeff 100644
> > --- a/libavformat/version.h
> > +++ b/libavformat/version.h
> > @@ -30,7 +30,7 @@
> >  #include "libavutil/version.h"
> >  
> >  #define LIBAVFORMAT_VERSION_MAJOR  57
> > -#define LIBAVFORMAT_VERSION_MINOR  15
> > +#define LIBAVFORMAT_VERSION_MINOR  16
> >  #define LIBAVFORMAT_VERSION_MICRO 100
> >  
> >  #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
> > 
> 
> Only MINOR is already at 16 now.

updated

applied

thanks

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

If a bugfix only changes things apparently unrelated to the bug with no
further explanation, that is a good sign that the bugfix is wrong.


signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH 1/3] avformat/ffmdec: Add cleaner API for ffserver to interface without depending on internal ABI

2015-11-19 Thread Michael Niedermayer 
From: Michael Niedermayer 

Signed-off-by: Michael Niedermayer 
---
 libavformat/ffm.h |2 ++
 libavformat/ffmdec.c  |   14 ++
 libavformat/version.h |2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/libavformat/ffm.h b/libavformat/ffm.h
index b392b8d..c445f47 100644
--- a/libavformat/ffm.h
+++ b/libavformat/ffm.h
@@ -42,6 +42,7 @@ enum {
 };
 
 typedef struct FFMContext {
+const AVClass *class;
 /* only reading mode */
 int64_t write_index, file_size;
 int read_state;
@@ -55,6 +56,7 @@ typedef struct FFMContext {
 uint8_t *packet_ptr, *packet_end;
 uint8_t packet[FFM_PACKET_SIZE];
 int64_t start_time;
+int server_attached;
 } FFMContext;
 
 #endif /* AVFORMAT_FFM_H */
diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c
index 59443b6..c3850db 100644
--- a/libavformat/ffmdec.c
+++ b/libavformat/ffmdec.c
@@ -731,6 +731,19 @@ static int ffm_probe(AVProbeData *p)
 return 0;
 }
 
+static const AVOption options[] = {
+{"server_attached", NULL, offsetof(FFMContext, server_attached), 
AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, AV_OPT_FLAG_EXPORT },
+{"ffm_write_index", NULL, offsetof(FFMContext, write_index), 
AV_OPT_TYPE_INT64, {.i64 = 0}, 0, 1, AV_OPT_FLAG_EXPORT },
+{"ffm_file_size", NULL, offsetof(FFMContext, file_size), 
AV_OPT_TYPE_INT64, {.i64 = 0}, 0, 1, AV_OPT_FLAG_EXPORT },
+{ NULL },
+};
+
+static const AVClass ffm_class = {
+.class_name = "ffm demuxer",
+.item_name  = av_default_item_name,
+.option = options,
+.version= LIBAVUTIL_VERSION_INT,
+};
 AVInputFormat ff_ffm_demuxer = {
 .name   = "ffm",
 .long_name  = NULL_IF_CONFIG_SMALL("FFM (FFserver live feed)"),
@@ -740,4 +753,5 @@ AVInputFormat ff_ffm_demuxer = {
 .read_packet= ffm_read_packet,
 .read_close = ffm_close,
 .read_seek  = ffm_seek,
+.priv_class = _class,
 };
diff --git a/libavformat/version.h b/libavformat/version.h
index 55198e7..d66eeff 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -30,7 +30,7 @@
 #include "libavutil/version.h"
 
 #define LIBAVFORMAT_VERSION_MAJOR  57
-#define LIBAVFORMAT_VERSION_MINOR  15
+#define LIBAVFORMAT_VERSION_MINOR  16
 #define LIBAVFORMAT_VERSION_MICRO 100
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
-- 
1.7.9.5

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel