| Message ID | 7f437b2af4e643dfbc804484e36d998a@gmail.com |
|---|---|
| State | Accepted |
| Commit | f040c1ec4e8020f250d4f9ff966607cb6e6b9811 |
| Headers | show |
| Series | [FFmpeg-devel] libavformat/file.c: 'file_delete()' and 'file_move()' require 'CONFIG_FILE_PROTOCOL' | expand |
| Context | Check | Description |
|---|---|---|
| andriy/x86_make | success | Make finished |
| andriy/x86_make_fate | success | Make fate finished |
| andriy/PPC64_make | success | Make finished |
| andriy/PPC64_make_fate | success | Make fate finished |
Michael Witten: > This quashes 2 warnings when the 'file' protocol is not enabled. > --- > libavformat/file.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/libavformat/file.c b/libavformat/file.c > index 8303436be0..9c23f680cd 100644 > --- a/libavformat/file.c > +++ b/libavformat/file.c > @@ -167,6 +167,8 @@ static int file_check(URLContext *h, int mask) > return ret; > } > > +#if CONFIG_FILE_PROTOCOL > + > static int file_delete(URLContext *h) > { > #if HAVE_UNISTD_H > @@ -203,8 +205,6 @@ static int file_move(URLContext *h_src, URLContext *h_dst) > return 0; > } > > -#if CONFIG_FILE_PROTOCOL > - > static int file_open(URLContext *h, const char *filename, int flags) > { > FileContext *c = h->priv_data; > Thanks, applied. - Andreas
diff --git a/libavformat/file.c b/libavformat/file.c index 8303436be0..9c23f680cd 100644 --- a/libavformat/file.c +++ b/libavformat/file.c @@ -167,6 +167,8 @@ static int file_check(URLContext *h, int mask) return ret; } +#if CONFIG_FILE_PROTOCOL + static int file_delete(URLContext *h) { #if HAVE_UNISTD_H @@ -203,8 +205,6 @@ static int file_move(URLContext *h_src, URLContext *h_dst) return 0; } -#if CONFIG_FILE_PROTOCOL - static int file_open(URLContext *h, const char *filename, int flags) { FileContext *c = h->priv_data;