diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-12-16 13:58:57 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-12-16 13:58:57 +0000 |
| commit | 4a92f5cbb43ef017728d86857538cab54b29cfde (patch) | |
| tree | a9fef4b0fa7339e0b5540585531ec89370a233cb /src/liba52 | |
| parent | 031c6c1b15e7fff6b46f62763ef73d9d72e82fa2 (diff) | |
| download | xine-lib-4a92f5cbb43ef017728d86857538cab54b29cfde.tar.gz xine-lib-4a92f5cbb43ef017728d86857538cab54b29cfde.tar.bz2 | |
use UTF-8 meta info setting, where we know the string is ASCII
(costly conversion is not necessary, because ASCII is a subset of UTF-8)
CVS patchset: 7264
CVS date: 2004/12/16 13:58:57
Diffstat (limited to 'src/liba52')
| -rw-r--r-- | src/liba52/xine_decoder.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/liba52/xine_decoder.c b/src/liba52/xine_decoder.c index 53ad05f83..ac47fcfe9 100644 --- a/src/liba52/xine_decoder.c +++ b/src/liba52/xine_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_decoder.c,v 1.72 2004/12/12 22:01:08 mroi Exp $ + * $Id: xine_decoder.c,v 1.73 2004/12/16 13:59:10 mroi Exp $ * * stuff needed to turn liba52 into a xine decoder plugin */ @@ -530,26 +530,26 @@ static void a52dec_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) { a52_bit_rate_old != this->a52_bit_rate) { if (((this->a52_flags & A52_CHANNEL_MASK) == A52_3F2R) && (this->a52_flags & A52_LFE)) - _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 5.1"); + _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 5.1"); else if ((((this->a52_flags & A52_CHANNEL_MASK) == A52_2F2R) && (this->a52_flags & A52_LFE)) || (((this->a52_flags & A52_CHANNEL_MASK) == A52_3F1R) && (this->a52_flags & A52_LFE))) - _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 4.1"); + _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 4.1"); else if ((this->a52_flags & A52_CHANNEL_MASK) == A52_3F2R) - _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 5.0"); + _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 5.0"); else if (((this->a52_flags & A52_CHANNEL_MASK) == A52_2F2R) || ((this->a52_flags & A52_CHANNEL_MASK) == A52_3F1R)) - _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 4.0"); + _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 4.0"); else if (((this->a52_flags & A52_CHANNEL_MASK) == A52_2F1R) || ((this->a52_flags & A52_CHANNEL_MASK) == A52_3F)) - _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 3.0"); + _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 3.0"); else if ((this->a52_flags & A52_CHANNEL_MASK) == A52_STEREO) - _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 2.0 (stereo)"); + _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 2.0 (stereo)"); else if ((this->a52_flags & A52_CHANNEL_MASK) == A52_DOLBY) - _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 2.0 (dolby)"); + _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 2.0 (dolby)"); else if ((this->a52_flags & A52_CHANNEL_MASK) == A52_MONO) - _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 1.0"); + _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 1.0"); else - _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52"); + _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52"); _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITRATE, this->a52_bit_rate); _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, this->a52_sample_rate); |