On 06/03/14 17:28, Alessandro Ghedini wrote: > On Thu, Mar 06, 2014 at 04:18:03PM +0100, Luca Barbato wrote: >> On 06/03/14 16:11, Alessandro Ghedini wrote: >>> Original ffmpeg commit 76d851b by Michael Niedermayer. >>> >>> Bug-Debian: https://bugs.debian.org/740421 >>> --- >>> doc/protocols.texi | 3 +++ >>> libavformat/http.c | 4 ++++ >>> 2 files changed, 7 insertions(+) >>> >>> diff --git a/doc/protocols.texi b/doc/protocols.texi >>> index 58fa8a0..9c32e9b 100644 >>> --- a/doc/protocols.texi >>> +++ b/doc/protocols.texi >>> @@ -92,6 +92,9 @@ HTTP (Hyper Text Transfer Protocol). >>> This protocol accepts the following options: >>> >>> @table @option >>> +@item mime_type >>> +Set MIME type. >>> + >>> @item icy >>> If set to 1 request ICY (SHOUTcast) metadata from the server. If the server >>> supports this, the metadata has to be retrieved by the application by >>> reading >>> diff --git a/libavformat/http.c b/libavformat/http.c >>> index 13e2de4..01a9041 100644 >>> --- a/libavformat/http.c >>> +++ b/libavformat/http.c >>> @@ -64,6 +64,7 @@ typedef struct { >>> int multiple_requests; /**< A flag which indicates if we use >>> persistent connections. */ >>> uint8_t *post_data; >>> int post_datalen; >>> + char *mime_type; >>> int icy; >>> char *icy_metadata_headers; >>> char *icy_metadata_packet; >>> @@ -84,6 +85,7 @@ static const AVOption options[] = { >>> {"headers", "custom HTTP headers, can override built in default headers", >>> OFFSET(headers), AV_OPT_TYPE_STRING, { 0 }, 0, 0, D|E }, >>> {"multiple_requests", "use persistent connections", >>> OFFSET(multiple_requests), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, D|E }, >>> {"post_data", "custom HTTP post data", OFFSET(post_data), >>> AV_OPT_TYPE_BINARY, .flags = D|E }, >>> +{"mime_type", "set MIME type", OFFSET(mime_type), AV_OPT_TYPE_STRING, {0}, >>> 0, 0, 0 }, >> >> We have a flag for it, if is to expose (and not set) the mime type of >> the content received. > > I'm not sure I understand how this would work. Also, what flag?
from opt.h +/** + * The option is inteded for exporting values to the caller. + */ +#define AV_OPT_FLAG_EXPORT 64 Instead of the last 0 use AV_OPT_FLAG_EXPORT | AV_OPT_FLAG_READONLY as we do for mpegts. Assuming it is read-only. lu _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
