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/libffmpeg | |
| 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/libffmpeg')
| -rw-r--r-- | src/libffmpeg/dvaudio_decoder.c | 4 | ||||
| -rw-r--r-- | src/libffmpeg/video_decoder.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/libffmpeg/dvaudio_decoder.c b/src/libffmpeg/dvaudio_decoder.c index d43c87b2a..af2c95db9 100644 --- a/src/libffmpeg/dvaudio_decoder.c +++ b/src/libffmpeg/dvaudio_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: dvaudio_decoder.c,v 1.5 2004/08/26 18:03:40 valtri Exp $ + * $Id: dvaudio_decoder.c,v 1.6 2004/12/16 13:58:57 mroi Exp $ * * dv audio decoder based on patch by Dan Dennedy <dan@dennedy.org> * @@ -278,7 +278,7 @@ static void dvaudio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) this->audio_bits = buf->decoder_info[2]; this->audio_channels = buf->decoder_info[3]; - _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "DV Audio"); + _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "DV Audio"); this->decoder_ok = 1; diff --git a/src/libffmpeg/video_decoder.c b/src/libffmpeg/video_decoder.c index fd3715023..3d2b9d456 100644 --- a/src/libffmpeg/video_decoder.c +++ b/src/libffmpeg/video_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: video_decoder.c,v 1.37 2004/12/12 22:01:08 mroi Exp $ + * $Id: video_decoder.c,v 1.38 2004/12/16 13:59:05 mroi Exp $ * * xine video decoder plugin using ffmpeg * @@ -336,8 +336,8 @@ static int ff_handle_mpeg_sequence(ff_video_decoder_t *this, mpeg_parser_t *pars * init codec */ if (!this->decoder_ok) { - _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, - "mpeg-1 (ffmpeg)"); + _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, + "mpeg-1 (ffmpeg)"); this->codec = avcodec_find_decoder (CODEC_ID_MPEG1VIDEO); if (!this->codec) { @@ -748,8 +748,8 @@ static void ff_decode_data (video_decoder_t *this_gen, buf_element_t *buf) { for(i = 0; i < sizeof(ff_video_lookup)/sizeof(ff_codec_t); i++) if(ff_video_lookup[i].type == codec_type) { this->codec = avcodec_find_decoder(ff_video_lookup[i].id); - _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, - ff_video_lookup[i].name); + _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, + ff_video_lookup[i].name); break; } |