diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-24 01:01:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-24 01:01:21 +0200 |
| commit | 2b0cdb7364fbe1e8a7e97d36ba36dc67fb24095e (patch) | |
| tree | 696306b4a66d7598f2795f9fbae4557135ff9104 /libavformat/Makefile | |
| parent | 42d44ec306d0656ace5cea63867f70fa686141cb (diff) | |
| parent | 16ad77b357ebbe74a7bc9568904c328a2722651e (diff) | |
| download | ffmpeg-2b0cdb7364fbe1e8a7e97d36ba36dc67fb24095e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Move id3v2 tag writing to a separate file.
swscale: add missing colons to x86 assembly yuv2planeX.
g722: split decoder and encoder into separate files
cosmetics: remove extra spaces before end-of-statement semi-colons
vorbisdec: check output buffer size before writing output
wavpack: calculate bpp using av_get_bytes_per_sample()
ac3enc: Set max value for mode options correctly
lavc: move get_b_cbp() from h263.h to mpeg4videoenc.c
mpeg12: move closed_gop from MpegEncContext to Mpeg1Context
mpeg12: move full_pel from MpegEncContext to Mpeg1Context
mpeg12: move Mpeg1Context from mpeg12.c to mpeg12.h
mpegvideo: remove some unused variables from MpegEncContext.
Conflicts:
libavcodec/mpeg12.c
libavformat/mp3enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/Makefile')
| -rw-r--r-- | libavformat/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 15ccb291ed..47045d321c 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -147,7 +147,7 @@ OBJS-$(CONFIG_MOV_MUXER) += movenc.o riff.o isom.o avc.o \ movenchint.o rtpenc_chain.o OBJS-$(CONFIG_MP2_MUXER) += mp3enc.o rawenc.o OBJS-$(CONFIG_MP3_DEMUXER) += mp3dec.o -OBJS-$(CONFIG_MP3_MUXER) += mp3enc.o rawenc.o +OBJS-$(CONFIG_MP3_MUXER) += mp3enc.o rawenc.o id3v2enc.o OBJS-$(CONFIG_MPC_DEMUXER) += mpc.o apetag.o OBJS-$(CONFIG_MPC8_DEMUXER) += mpc8.o OBJS-$(CONFIG_MPEG1SYSTEM_MUXER) += mpegenc.o |