# HG changeset patch
# User bcoudurier
# Date 1268696451 0
# Node ID 8e889ce0d6165a2dd84f153e625d036f7d17342e
# Parent  6962a149f0a4f9f8567a73d6ac47581422542353
100L, revert r22560, already present

diff -r 6962a149f0a4 -r 8e889ce0d616 Makefile
--- a/Makefile	Mon Mar 15 23:11:02 2010 +0000
+++ b/Makefile	Mon Mar 15 23:40:51 2010 +0000
@@ -477,7 +477,6 @@
 OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER)       += adpcm.o
 
 # libavformat dependencies
-OBJS-$(CONFIG_MPEGTS_MUXER)            += mpeg4audio.o
 OBJS-$(CONFIG_ADTS_MUXER)              += mpeg4audio.o
 OBJS-$(CONFIG_CAF_DEMUXER)             += mpeg4audio.o mpegaudiodata.o
 OBJS-$(CONFIG_DV_DEMUXER)              += dvdata.o