| Message ID | 20180331232428.89172-3-josh@itanimul.li |
|---|---|
| State | Superseded |
| Headers | show |
On 3/31/2018 8:24 PM, Josh de Kock wrote: > Signed-off-by: Josh de Kock <josh@itanimul.li> Add a line saying it was mistakenly added to avformat.h > --- > libavformat/avformat.h | 2 -- > libavformat/internal.h | 1 + > 2 files changed, 1 insertion(+), 2 deletions(-) > > diff --git a/libavformat/avformat.h b/libavformat/avformat.h > index ec4e5f45f5..a2fe7c6bb2 100644 > --- a/libavformat/avformat.h > +++ b/libavformat/avformat.h > @@ -3060,8 +3060,6 @@ int avformat_transfer_internal_stream_timing_info(const AVOutputFormat *ofmt, > */ > AVRational av_stream_get_codec_timebase(const AVStream *st); > > - > -void avpriv_register_devices(const AVOutputFormat * const o[], const AVInputFormat * const i[]); > /** > * @} > */ > diff --git a/libavformat/internal.h b/libavformat/internal.h > index 619063097f..23eb7e8a7c 100644 > --- a/libavformat/internal.h > +++ b/libavformat/internal.h > @@ -731,4 +731,5 @@ int ff_unlock_avformat(void); > */ > void ff_format_set_url(AVFormatContext *s, char *url); > > +void avpriv_register_devices(const AVOutputFormat * const o[], const AVInputFormat * const i[]); > #endif /* AVFORMAT_INTERNAL_H */ Include libavformat/internal.h in libavdevice/alldevices.c, otherwise it will not compile.
On 3/31/2018 8:30 PM, James Almer wrote: > On 3/31/2018 8:24 PM, Josh de Kock wrote: >> Signed-off-by: Josh de Kock <josh@itanimul.li> > > Add a line saying it was mistakenly added to avformat.h > >> --- >> libavformat/avformat.h | 2 -- >> libavformat/internal.h | 1 + >> 2 files changed, 1 insertion(+), 2 deletions(-) >> >> diff --git a/libavformat/avformat.h b/libavformat/avformat.h >> index ec4e5f45f5..a2fe7c6bb2 100644 >> --- a/libavformat/avformat.h >> +++ b/libavformat/avformat.h >> @@ -3060,8 +3060,6 @@ int avformat_transfer_internal_stream_timing_info(const AVOutputFormat *ofmt, >> */ >> AVRational av_stream_get_codec_timebase(const AVStream *st); >> >> - >> -void avpriv_register_devices(const AVOutputFormat * const o[], const AVInputFormat * const i[]); >> /** >> * @} >> */ >> diff --git a/libavformat/internal.h b/libavformat/internal.h >> index 619063097f..23eb7e8a7c 100644 >> --- a/libavformat/internal.h >> +++ b/libavformat/internal.h >> @@ -731,4 +731,5 @@ int ff_unlock_avformat(void); >> */ >> void ff_format_set_url(AVFormatContext *s, char *url); >> >> +void avpriv_register_devices(const AVOutputFormat * const o[], const AVInputFormat * const i[]); >> #endif /* AVFORMAT_INTERNAL_H */ > > Include libavformat/internal.h in libavdevice/alldevices.c, otherwise it > will not compile. And also libavformat/allformats.c it seems.
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index ec4e5f45f5..a2fe7c6bb2 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -3060,8 +3060,6 @@ int avformat_transfer_internal_stream_timing_info(const AVOutputFormat *ofmt, */ AVRational av_stream_get_codec_timebase(const AVStream *st); - -void avpriv_register_devices(const AVOutputFormat * const o[], const AVInputFormat * const i[]); /** * @} */ diff --git a/libavformat/internal.h b/libavformat/internal.h index 619063097f..23eb7e8a7c 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -731,4 +731,5 @@ int ff_unlock_avformat(void); */ void ff_format_set_url(AVFormatContext *s, char *url); +void avpriv_register_devices(const AVOutputFormat * const o[], const AVInputFormat * const i[]); #endif /* AVFORMAT_INTERNAL_H */
Signed-off-by: Josh de Kock <josh@itanimul.li> --- libavformat/avformat.h | 2 -- libavformat/internal.h | 1 + 2 files changed, 1 insertion(+), 2 deletions(-)