summaryrefslogtreecommitdiffstats
path: root/libaf/format.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-08-01 17:07:35 +0200
committerwm4 <wm4@nowhere>2012-08-01 17:07:35 +0200
commitc92538dfaa5eb7e9b2773f158cbb310545116abe (patch)
tree4b1ab99a17cbead6ff1b7bf9714642540cd66ce4 /libaf/format.c
parent7175f178de72bb4f31cacd79b395a14beaf2f65a (diff)
downloadmpv-c92538dfaa5eb7e9b2773f158cbb310545116abe.tar.bz2
mpv-c92538dfaa5eb7e9b2773f158cbb310545116abe.tar.xz
Remove dead code
This was done with the help of callcatcher [1]. Only functions which are statically known to be unused are removed. Some unused functions are not removed yet, because they might be needed in the near future (such as open_output_stream for the encode branch). There is one user visible change: the --subcc option did nothing, and is removed with this commit. [1] http://www.skynet.ie/~caolan/Packages/callcatcher.html
Diffstat (limited to 'libaf/format.c')
-rw-r--r--libaf/format.c45
1 files changed, 0 insertions, 45 deletions
diff --git a/libaf/format.c b/libaf/format.c
index 5d77eabeea..638485cc23 100644
--- a/libaf/format.c
+++ b/libaf/format.c
@@ -26,51 +26,6 @@
#include "af.h"
-// Convert from string to format
-int af_str2fmt(const char* str)
-{
- int format=0;
- // Scan for endianness
- if(strstr(str,"be") || strstr(str,"BE"))
- format |= AF_FORMAT_BE;
- else if(strstr(str,"le") || strstr(str,"LE"))
- format |= AF_FORMAT_LE;
- else
- format |= AF_FORMAT_NE;
-
- // Scan for special formats
- if(strstr(str,"mulaw") || strstr(str,"MULAW")){
- format |= AF_FORMAT_MU_LAW; return format;
- }
- if(strstr(str,"alaw") || strstr(str,"ALAW")){
- format |= AF_FORMAT_A_LAW; return format;
- }
- if(strstr(str,"ac3") || strstr(str,"AC3")){
- format |= AF_FORMAT_AC3 | AF_FORMAT_16BIT; return format;
- }
- if(strstr(str,"mpeg2") || strstr(str,"MPEG2")){
- format |= AF_FORMAT_MPEG2; return format;
- }
- if(strstr(str,"imaadpcm") || strstr(str,"IMAADPCM")){
- format |= AF_FORMAT_IMA_ADPCM; return format;
- }
-
- // Scan for int/float
- if(strstr(str,"float") || strstr(str,"FLOAT")){
- format |= AF_FORMAT_F; return format;
- }
- else
- format |= AF_FORMAT_I;
-
- // Scan for signed/unsigned
- if(strstr(str,"unsigned") || strstr(str,"UNSIGNED"))
- format |= AF_FORMAT_US;
- else
- format |= AF_FORMAT_SI;
-
- return format;
-}
-
int af_fmt2bits(int format)
{
if (AF_FORMAT_IS_AC3(format)) return 16;