Here is the diff: --- /etc/avserver.conf 2011-08-26 06:12:12.000000000 -0400 +++ /etc/avserver.conf.dpkg-new 2013-11-03 08:51:39.000000000 -0500 @@ -12,7 +12,7 @@ # MaxClients maximum limit. MaxHTTPConnections 2000 -# Number of simultaneous requests that can be handled. Since FFServer +# Number of simultaneous requests that can be handled. Since AVServer # is very fast, it is more likely that you will want to leave this high # and use MaxBandwidth, below. MaxClients 1000 @@ -25,24 +25,21 @@ # '-' is the standard output. CustomLog - -# Suppress that if you want to launch ffserver as a daemon. -NoDaemon - ################################################################## # Definition of the live feeds. Each live feed contains one video -# and/or audio sequence coming from an ffmpeg encoder or another -# ffserver. This sequence may be encoded simultaneously with several +# and/or audio sequence coming from an avconv encoder or another +# avserver. This sequence may be encoded simultaneously with several # codecs at several resolutions. <Feed feed1.ffm> -# You must use 'ffmpeg' to send a live feed to ffserver. In this +# You must use 'avconv' to send a live feed to avserver. In this # example, you can type: # -# ffmpeg http://localhost:8090/feed1.ffm +# avconv http://localhost:8090/feed1.ffm -# ffserver can also do time shifting. It means that it can stream any +# avserver can also do time shifting. It means that it can stream any # previously recorded live stream. The request should contain: # "http://xxxx?date=[YYYY-MM-DDT][[HH:]MM:]SS[.m...]".You must specify # a path where the feed is stored on disk. You also specify the @@ -55,10 +52,10 @@ # ReadOnlyFile /saved/specialvideo.ffm # This marks the file as readonly and it will not be deleted or updated. -# Specify launch in order to start ffmpeg automatically. -# First ffmpeg must be defined with an appropriate path if needed, +# Specify launch in order to start avconv automatically. +# First avconv must be defined with an appropriate path if needed, # after that options can follow, but avoid adding the http:// field -#Launch ffmpeg +#Launch avconv # Only allow connections from localhost to the feed. ACL allow 127.0.0.1 @@ -69,7 +66,7 @@ ################################################################## # Now you can define each stream which will be generated from the # original audio and video stream. Each format has a filename (here -# 'test1.mpg'). FFServer will send this stream when answering a +# 'test1.mpg'). AVServer will send this stream when answering a # request containing this filename. <Stream test1.mpg> @@ -334,7 +331,7 @@ # multicast address with MulticastAddress. The port and the TTL can # also be set. # -# An SDP file is automatically generated by ffserver by adding the +# An SDP file is automatically generated by avserver by adding the # 'sdp' extension to the stream name (here # http://localhost:8090/test1-sdp.sdp). You should usually give this # file to your player to play the stream. @@ -373,5 +370,3 @@ <Redirect index.html> URL http://www.libav.org/ </Redirect> - -
-- You received this bug notification because you are a member of Desktop Packages, which is subscribed to libav in Ubuntu. https://bugs.launchpad.net/bugs/1260751 Title: Conffile prompt on upgrade from 13.10 to 14.04 Status in “libav” package in Ubuntu: New Bug description: I got a conffile prompt for /etc/avserver.conf when upgrading from 13.10 to 14.04. I have never touched this file by hand, and the diff looks like it was caused by a rename from 'FFServer' to 'AVServer'. This file should be updated automatically, without user intervention, during a dist upgrade. ProblemType: Bug DistroRelease: Ubuntu 14.04 Package: libav-tools 6:9.10-1ubuntu1 ProcVersionSignature: Ubuntu 3.11.0-14.21-generic 3.11.7 Uname: Linux 3.11.0-14-generic x86_64 NonfreeKernelModules: vboxpci vboxnetadp vboxnetflt vboxdrv nvidia ApportVersion: 2.12.7-0ubuntu2 Architecture: amd64 CurrentDesktop: Unity Date: Fri Dec 13 09:30:26 2013 InstallationDate: Installed on 2010-09-17 (1183 days ago) InstallationMedia: Ubuntu 10.10 "Maverick Meerkat" - Beta amd64 (20100901.1) SourcePackage: libav UpgradeStatus: Upgraded to trusty on 2013-12-13 (0 days ago) mtime.conffile..etc.avserver.conf: 2011-08-26T06:12:12 To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/libav/+bug/1260751/+subscriptions -- Mailing list: https://launchpad.net/~desktop-packages Post to : desktop-packages@lists.launchpad.net Unsubscribe : https://launchpad.net/~desktop-packages More help : https://help.launchpad.net/ListHelp
