virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

lavf/dv: always provide avpriv_dv_* symbols

Browse Source 
They are used from libavdevice.
This commit is contained in:
Anton Khirnov 2022-08-23 10:41:04 +02:00
parent dcc4704a4e
commit b6196cb2ef
3 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure vendored
View File

@ -3532,6 +3532,7 @@ gdigrab_indev_deps="CreateDIBSection"
gdigrab_indev_extralibs="-lgdi32" gdigrab_indev_extralibs="-lgdi32"
gdigrab_indev_select="bmp_decoder" gdigrab_indev_select="bmp_decoder"
iec61883_indev_deps="libiec61883" iec61883_indev_deps="libiec61883"
iec61883_indev_select="dv_demuxer"
jack_indev_deps="libjack" jack_indev_deps="libjack"
jack_indev_deps_any="sem_timedwait dispatch_dispatch_h" jack_indev_deps_any="sem_timedwait dispatch_dispatch_h"
kmsgrab_indev_deps="libdrm" kmsgrab_indev_deps="libdrm"

3
libavformat/Makefile
View File

@ -13,6 +13,7 @@ OBJS = allformats.o \
demux.o \ demux.o \
demux_utils.o \ demux_utils.o \
dump.o \ dump.o \
dv.o \
format.o \ format.o \
id3v1.o \ id3v1.o \
id3v2.o \ id3v2.o \
@ -184,7 +185,6 @@ OBJS-$(CONFIG_DSS_DEMUXER) += dss.o
OBJS-$(CONFIG_DTSHD_DEMUXER) += dtshddec.o OBJS-$(CONFIG_DTSHD_DEMUXER) += dtshddec.o
OBJS-$(CONFIG_DTS_DEMUXER) += dtsdec.o rawdec.o OBJS-$(CONFIG_DTS_DEMUXER) += dtsdec.o rawdec.o
OBJS-$(CONFIG_DTS_MUXER) += rawenc.o OBJS-$(CONFIG_DTS_MUXER) += rawenc.o
OBJS-$(CONFIG_DV_DEMUXER) += dv.o
OBJS-$(CONFIG_DV_MUXER) += dvenc.o OBJS-$(CONFIG_DV_MUXER) += dvenc.o
OBJS-$(CONFIG_DVBSUB_DEMUXER) += dvbsub.o rawdec.o OBJS-$(CONFIG_DVBSUB_DEMUXER) += dvbsub.o rawdec.o
OBJS-$(CONFIG_DVBTXT_DEMUXER) += dvbtxt.o rawdec.o OBJS-$(CONFIG_DVBTXT_DEMUXER) += dvbtxt.o rawdec.o
@ -711,7 +711,6 @@ SHLIBOBJS-$(CONFIG_RTP_MUXER) += golomb_tab.o jpegtables.o \
SHLIBOBJS-$(CONFIG_SPDIF_MUXER) += dca_sample_rate_tab.o SHLIBOBJS-$(CONFIG_SPDIF_MUXER) += dca_sample_rate_tab.o
# libavdevice dependencies # libavdevice dependencies
OBJS-$(CONFIG_IEC61883_INDEV) += dv.o
# Windows resource file # Windows resource file
SHLIBOBJS-$(HAVE_GNU_WINDRES) += avformatres.o SHLIBOBJS-$(HAVE_GNU_WINDRES) += avformatres.o

23
libavformat/dv.c
View File

@ -28,6 +28,9 @@
* License along with FFmpeg; if not, write to the Free Software * License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "config_components.h"
#include <time.h> #include <time.h>
#include "avformat.h" #include "avformat.h"
#include "internal.h" #include "internal.h"
@ -40,6 +43,8 @@
#include "dv.h" #include "dv.h"
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#if CONFIG_DV_DEMUXER
// Must be kept in sync with AVPacket // Must be kept in sync with AVPacket
struct DVPacket { struct DVPacket {
int64_t pts; int64_t pts;
@ -647,3 +652,21 @@ const AVInputFormat ff_dv_demuxer = {
.read_seek = dv_read_seek, .read_seek = dv_read_seek,
.extensions = "dv,dif", .extensions = "dv,dif",
}; };
#else // CONFIG_DV_DEMUXER
DVDemuxContext *avpriv_dv_init_demux(AVFormatContext *s)
{
return NULL;
}
int avpriv_dv_get_packet(DVDemuxContext *c, AVPacket *pkt)
{
return AVERROR(ENOSYS);
}
int avpriv_dv_produce_packet(DVDemuxContext *c, AVPacket *pkt,
uint8_t *buf, int buf_size, int64_t pos)
{
return AVERROR(ENOSYS);
}
#endif // CONFIG_DV_DEMUXER