diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-23 14:36:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-23 14:53:21 +0100 |
| commit | def18e5470bdcddb9d737784cc6ae427c195da7c (patch) | |
| tree | 1fbf600ae18a94ff1c87e4c8512e2e708b6f3c24 /libavcodec/Makefile | |
| parent | 2f9903f66220b3f175c66e8543ff6066beaa7c66 (diff) | |
| parent | b047c68783aa4042b322af7af043b643d5daf09c (diff) | |
| download | ffmpeg-def18e5470bdcddb9d737784cc6ae427c195da7c.tar.gz | |
Merge commit 'b047c68783aa4042b322af7af043b643d5daf09c'
* commit 'b047c68783aa4042b322af7af043b643d5daf09c':
4xm: don't rely on get_buffer() initializing the frame.
huffyuv: split encoder and decoder into separate files.
lavc: make pkt_{p,d}ts doxy less confusing
Conflicts:
libavcodec/Makefile
libavcodec/huffyuv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 1bd23ab675..1ca490c144 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -190,8 +190,8 @@ OBJS-$(CONFIG_ESCAPE130_DECODER) += escape130.o OBJS-$(CONFIG_EXR_DECODER) += exr.o OBJS-$(CONFIG_FFV1_DECODER) += ffv1dec.o ffv1.o OBJS-$(CONFIG_FFV1_ENCODER) += ffv1enc.o ffv1.o -OBJS-$(CONFIG_FFVHUFF_DECODER) += huffyuv.o -OBJS-$(CONFIG_FFVHUFF_ENCODER) += huffyuv.o +OBJS-$(CONFIG_FFVHUFF_DECODER) += huffyuv.o huffyuvdec.o +OBJS-$(CONFIG_FFVHUFF_ENCODER) += huffyuv.o huffyuvenc.o OBJS-$(CONFIG_FFWAVESYNTH_DECODER) += ffwavesynth.o OBJS-$(CONFIG_FLAC_DECODER) += flacdec.o flacdata.o flac.o flacdsp.o OBJS-$(CONFIG_FLAC_ENCODER) += flacenc.o flacdata.o flac.o flacdsp.o vorbis_data.o @@ -227,8 +227,8 @@ OBJS-$(CONFIG_H264_DXVA2_HWACCEL) += dxva2_h264.o OBJS-$(CONFIG_H264_VAAPI_HWACCEL) += vaapi_h264.o OBJS-$(CONFIG_H264_VDA_HWACCEL) += vda_h264.o OBJS-$(CONFIG_H264_VDA_DECODER) += vda_h264_dec.o -OBJS-$(CONFIG_HUFFYUV_DECODER) += huffyuv.o -OBJS-$(CONFIG_HUFFYUV_ENCODER) += huffyuv.o +OBJS-$(CONFIG_HUFFYUV_DECODER) += huffyuv.o huffyuvdec.o +OBJS-$(CONFIG_HUFFYUV_ENCODER) += huffyuv.o huffyuvenc.o OBJS-$(CONFIG_IAC_DECODER) += imc.o OBJS-$(CONFIG_IDCIN_DECODER) += idcinvideo.o OBJS-$(CONFIG_IDF_DECODER) += bintext.o cga_data.o |