From f7a427676c0fe3c12509e3d9a243301f93626b0a Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 5 Apr 2013 19:47:51 +0200 Subject: audio: add some setters for mp_audio, and require filters to use them mp_audio has some redundant fields. Setters like mp_audio_set_format() initialize these properly. Also move the mp_audio struct to a the file audio.c. We can remove a mysterious line of code from af.c: in.format |= af_bits2fmt(in.bps * 8); I'm not sure if this was ever actually needed, or if it was some kind of "make it work" quick-fix that works against the way things were supposed to work. All filters etc. now set the format correctly, so if there ever was a need for this code, it's definitely gone. --- audio/format.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'audio/format.c') diff --git a/audio/format.c b/audio/format.c index 9625857ada..012d24b010 100644 --- a/audio/format.c +++ b/audio/format.c @@ -29,6 +29,8 @@ int af_fmt2bits(int format) { if (AF_FORMAT_IS_AC3(format)) return 16; + if (format == AF_FORMAT_UNKNOWN) + return 0; return (format & AF_FORMAT_BITS_MASK)+8; // return (((format & AF_FORMAT_BITS_MASK)>>3)+1) * 8; #if 0 -- cgit v1.2.3