Update ffmpeg.spec file.

extras/contrib/src/Makefile

@@ -1004,7 +1004,6 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2
 ffmpeg-rpm: ffmpeg.tar.gz
 	$(RPM_PREPARE)
 #	sed -e 's/$$(FFMPEGCONF)/$(FFMPEGCONF)/' -e 's/$$(CFLAGS)/$(CFLAGS)/' -e 's/$$(FFMPEG_CFLAGS)/$(FFMPEG_CFLAGS)/' -i.orig rpm/SPECS/ffmpeg.spec
-	sed -e 's/BuildRequires/#BuildRequires/' -i.orig rpm/SPECS/ffmpeg.spec
 	$(RPM_BUILD_SPEC)
 	touch $@
 

extras/contrib/src/Patches/ffmpeg.spec

@@ -24,17 +24,18 @@ rm -fr $RPM_BUILD_ROOT
 %setup -n ffmpeg
 
 %build
-./configure --enable-libmp3lame --enable-libfaac --enable-libamr --enable-libamr-nb --enable-libamr-wb --prefix=/usr --extra-cflags="-I/home/jpsaman/Source/vlc-0.8.6c-bugfix-m2x.git/extras/contrib/include -I/usr/include -DRUNTIME_CPUDETECT" --extra-ldflags="-L/home/jpsaman/Source/vlc-0.8.6c-bugfix-m2x.git/extras/contrib/lib" --enable-gpl --enable-pp --disable-vhook --disable-ffserver --disable-network --enable-liba52 --disable-swscaler --disable-ffplay
+./configure --enable-libmp3lame --enable-libfaac --enable-libamr --enable-libamr-nb --enable-libamr-wb --prefix=/usr --extra-cflags="${CFLAGS} ${FFMPEG_CFLAGS}  -DRUNTIME_CPUDETECT" --extra-ldflags="${LDFLAGS}" --enable-gpl --enable-pp --disable-vhook --disable-ffserver --disable-network --enable-liba52 --disable-swscaler --disable-ffplay
 
-make
+#make
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=$RPM_BUILD_ROOT install-libs install-headers
 
 %files
 %defattr(-,root,root)
 %doc Changelog COPYING.GPL COPYING.LGPL CREDITS INSTALL MAINTAINERS README 
-%{_bindir}/ffmpeg
+#%{_bindir}/ffmpeg
+#%{_bindir}/ffplay
 if %ffmpeg_shared; then
 %{_libdir}/libavcodec.so
 %{_libdir}/libavcodec.so.51