summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
authorwm4 <wm4@mplayer2.org>2012-04-28 00:39:19 +0200
committerwm4 <wm4@mplayer2.org>2012-04-28 00:54:26 +0200
commit87f4cafe9c0881743d1117c2e8cd7e3376e33302 (patch)
treef41caa5aad8969d769a777c0a7912751721a66bd /stream
parent1324eaece08d84fbe3eb539642dba99b74dd1c07 (diff)
parentb711624ef350d1e971f5fcc57eb4af9f74233d2a (diff)
downloadmpv-87f4cafe9c0881743d1117c2e8cd7e3376e33302.tar.bz2
mpv-87f4cafe9c0881743d1117c2e8cd7e3376e33302.tar.xz
Merge remote-tracking branch 'origin/master'
Conflicts: command.c libao2/ao_alsa.c libao2/ao_dsound.c libao2/ao_pulse.c libao2/audio_out.h mixer.c mixer.h mplayer.c Replace my mixer changes with uau's implementation, which is based on my code.
Diffstat (limited to 'stream')
-rw-r--r--stream/stream_pvr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/stream/stream_pvr.c b/stream/stream_pvr.c
index 745686e2e3..7fd3fe3a34 100644
--- a/stream/stream_pvr.c
+++ b/stream/stream_pvr.c
@@ -89,7 +89,7 @@ int pvr_param_bitrate_peak = 0;
char *pvr_param_stream_type = NULL;
typedef struct station_elem_s {
- char name[8];
+ char name[PVR_STATION_NAME_SIZE];
int freq;
char station[PVR_STATION_NAME_SIZE];
int enabled;