diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-07-05 22:01:07 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-07-05 22:01:07 +0000 |
| commit | 4c4a1070febe5a140cac0357267af338b9852a7e (patch) | |
| tree | d7ed87a85da0733f33ea47c25797f58c25e5e9fc /libmpdemux | |
| parent | b3d59ea908ce87b3dc50bb9ba0ac81edd4765797 (diff) | |
| download | mpv-4c4a1070febe5a140cac0357267af338b9852a7e.tar.bz2 mpv-4c4a1070febe5a140cac0357267af338b9852a7e.tar.xz | |
Avoid code duplication and ugly config.h hack by using av_strlcat/av_strlcpy
instead of plain strlcat/strlcpy
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23723 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_mkv.c | 5 | ||||
| -rw-r--r-- | libmpdemux/demux_ty.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index 83a7acc1d4..f2ca7eb6b8 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -45,6 +45,7 @@ #include "libavutil/lzo.h" #include "libavutil/intreadwrite.h" #endif +#include "libavutil/avstring.h" static unsigned char sipr_swaps[38][2]={ {0,63},{1,22},{2,44},{3,90},{5,81},{7,31},{8,86},{9,58},{10,36},{12,68}, @@ -3607,7 +3608,7 @@ demux_mkv_get_sub_lang(demuxer_t *demuxer, int track_num, char *lang, mkv_demuxer_t *mkv_d = (mkv_demuxer_t *) demuxer->priv; mkv_track_t *track = demux_mkv_find_track_by_num (mkv_d, track_num, MATROSKA_TRACK_SUBTITLE); if (track && track->language && strcmp(track->language, "und")) - strlcpy(lang, track->language, maxlen); + av_strlcpy(lang, track->language, maxlen); } /** \brief Get the language code for an audio track. @@ -3627,7 +3628,7 @@ demux_mkv_get_audio_lang(demuxer_t *demuxer, int track_num, char *lang, mkv_demuxer_t *mkv_d = (mkv_demuxer_t *) demuxer->priv; mkv_track_t *track = demux_mkv_find_track_by_num (mkv_d, track_num, MATROSKA_TRACK_AUDIO); if (track && track->language && strcmp(track->language, "und")) - strlcpy(lang, track->language, maxlen); + av_strlcpy(lang, track->language, maxlen); } diff --git a/libmpdemux/demux_ty.c b/libmpdemux/demux_ty.c index 9f2a6e4c05..5f3f25eb80 100644 --- a/libmpdemux/demux_ty.c +++ b/libmpdemux/demux_ty.c @@ -44,6 +44,7 @@ #include "parse_es.h" #include "stheader.h" #include "sub_cc.h" +#include "libavutil/avstring.h" extern void skip_audio_frame( sh_audio_t *sh_audio ); extern int sub_justify; @@ -201,8 +202,8 @@ int ty_tmf_filetoparts( demuxer_t *demux, TiVoInfo *tivo ) error = 1; break; } - strlcpy( name, &header[ 0 ], 100 ); - strlcpy( sizestr, &header[ 124 ], 12 ); + av_strlcpy( name, &header[ 0 ], 100 ); + av_strlcpy( sizestr, &header[ 124 ], 12 ); size = ty_octaltodecimal( sizestr ); blocks = size / 512; |