diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-10 14:04:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-10 14:07:05 +0200 |
| commit | cd6f5c4895c49b483542030324ea5198521ab28b (patch) | |
| tree | c1ae5a95d3b19de827e98270ff060124086c4414 /libavcodec/Makefile | |
| parent | b7ebb49d035205bcfbcc4f1788df5ba1419fadc8 (diff) | |
| parent | 6d0beefbf6ee6dbf8efb522a9307e54c6ed5f702 (diff) | |
| download | ffmpeg-cd6f5c4895c49b483542030324ea5198521ab28b.tar.gz | |
Merge commit '6d0beefbf6ee6dbf8efb522a9307e54c6ed5f702'
* commit '6d0beefbf6ee6dbf8efb522a9307e54c6ed5f702':
swscale: Do not make ff_ symbols globally visible.
rtspdec: use av_strlcpy for writing into fixed size buffer
g722enc: fix size argument in memset
http: use av_strlcpy instead of strcpy() without size checks
avfilter: correct memcpy size avfilter_copy_buf_props()
lavc: split asv12 encoder/decoder
Conflicts:
libavcodec/asvdec.c
libavfilter/buffer.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 7730c16453..d8fc0f0c42 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -107,10 +107,10 @@ OBJS-$(CONFIG_ANSI_DECODER) += ansi.o cga_data.o OBJS-$(CONFIG_APE_DECODER) += apedec.o OBJS-$(CONFIG_ASS_DECODER) += assdec.o ass.o ass_split.o OBJS-$(CONFIG_ASS_ENCODER) += assenc.o ass.o -OBJS-$(CONFIG_ASV1_DECODER) += asv1.o mpeg12data.o -OBJS-$(CONFIG_ASV1_ENCODER) += asv1.o mpeg12data.o -OBJS-$(CONFIG_ASV2_DECODER) += asv1.o mpeg12data.o -OBJS-$(CONFIG_ASV2_ENCODER) += asv1.o mpeg12data.o +OBJS-$(CONFIG_ASV1_DECODER) += asvdec.o asv.o mpeg12data.o +OBJS-$(CONFIG_ASV1_ENCODER) += asvenc.o asv.o mpeg12data.o +OBJS-$(CONFIG_ASV2_DECODER) += asvdec.o asv.o mpeg12data.o +OBJS-$(CONFIG_ASV2_ENCODER) += asvenc.o asv.o mpeg12data.o OBJS-$(CONFIG_ATRAC1_DECODER) += atrac1.o atrac.o OBJS-$(CONFIG_ATRAC3_DECODER) += atrac3.o atrac.o OBJS-$(CONFIG_AURA_DECODER) += cyuv.o |