diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-28 04:12:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-28 04:12:24 +0200 |
| commit | 7b453d1c60005cd1e0461a8d06d07e89116772d4 (patch) | |
| tree | 55f5b363a0f6b5f447026edb8e80b38ef8c22437 /libavcodec/Makefile | |
| parent | 4a619fcae99c7fc8cae7070c7859243c40cdb4bc (diff) | |
| parent | 55abaa58e5ede59d497e1ab89d5fe0950d1c6ecf (diff) | |
| download | ffmpeg-7b453d1c60005cd1e0461a8d06d07e89116772d4.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
westwood_vqa: fix SND0 chunk handling
westwood_vqa: set video stream duration
raw: forward avpicture_fill() error code in raw_decode().
build: Do not explicitly add the doc directory to the OBJDIRS list.
dv: Split off DV video decoder into its own file.
build: fix RALF decoder standalone compilation, which depends on Golomb code
configure: Drop stray duplicate entry for --disable-fft from help output.
Conflicts:
libavcodec/dv.c
libavcodec/rawdec.c
libavformat/westwood_vqa.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 6dfc9d766b..d554df5a04 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -138,7 +138,7 @@ OBJS-$(CONFIG_DVBSUB_DECODER) += dvbsubdec.o OBJS-$(CONFIG_DVBSUB_ENCODER) += dvbsub.o OBJS-$(CONFIG_DVDSUB_DECODER) += dvdsubdec.o OBJS-$(CONFIG_DVDSUB_ENCODER) += dvdsubenc.o -OBJS-$(CONFIG_DVVIDEO_DECODER) += dv.o dvdata.o +OBJS-$(CONFIG_DVVIDEO_DECODER) += dvdec.o dv.o dvdata.o OBJS-$(CONFIG_DVVIDEO_ENCODER) += dv.o dvdata.o OBJS-$(CONFIG_DXA_DECODER) += dxa.o OBJS-$(CONFIG_DXTORY_DECODER) += dxtory.o |