diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-25 15:04:07 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-25 15:07:30 +0200 |
| commit | 69fe2522f8c2a04eda112eee6319ca2e85d7038b (patch) | |
| tree | 83a8b19997e621309344ca1f3997a48886ef0944 /libaf/format.c | |
| parent | 9436e0452fad48e671d7320cb18c588655f3d230 (diff) | |
| parent | 1cda8b002fb19c3da14760fe1f9fc76992a05c29 (diff) | |
| download | mpv-69fe2522f8c2a04eda112eee6319ca2e85d7038b.tar.bz2 mpv-69fe2522f8c2a04eda112eee6319ca2e85d7038b.tar.xz | |
Merge svn changes up to r30301
Diffstat (limited to 'libaf/format.c')
| -rw-r--r-- | libaf/format.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libaf/format.c b/libaf/format.c index 93dfdbbc31..8146899c7e 100644 --- a/libaf/format.c +++ b/libaf/format.c @@ -47,7 +47,7 @@ int af_str2fmt(const char* str) format |= AF_FORMAT_A_LAW; return format; } if(strstr(str,"ac3") || strstr(str,"AC3")){ - format |= AF_FORMAT_AC3; return format; + format |= AF_FORMAT_AC3 | AF_FORMAT_16BIT; return format; } if(strstr(str,"mpeg2") || strstr(str,"MPEG2")){ format |= AF_FORMAT_MPEG2; return format; @@ -74,6 +74,7 @@ int af_str2fmt(const char* str) int af_fmt2bits(int format) { + if (AF_FORMAT_IS_AC3(format)) return 16; return (format & AF_FORMAT_BITS_MASK)+8; // return (((format & AF_FORMAT_BITS_MASK)>>3)+1) * 8; #if 0 @@ -157,7 +158,9 @@ static struct { { "mulaw", AF_FORMAT_MU_LAW }, { "alaw", AF_FORMAT_A_LAW }, { "mpeg2", AF_FORMAT_MPEG2 }, - { "ac3", AF_FORMAT_AC3 }, + { "ac3le", AF_FORMAT_AC3_LE }, + { "ac3be", AF_FORMAT_AC3_BE }, + { "ac3ne", AF_FORMAT_AC3_NE }, { "imaadpcm", AF_FORMAT_IMA_ADPCM }, { "u8", AF_FORMAT_U8 }, |