diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2007-11-29 17:50:44 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2007-11-29 17:50:44 +0000 |
| commit | afac5cce501cfc6b46792cea06e20cbe07271fc7 (patch) | |
| tree | 618831e523571a05ffb2ca1af5dcf337a7cf04b8 /formats/format_h264.c | |
| parent | 4807fe0f0d68a99313c59f33dd4234c1b6b48ebf (diff) | |
Merged revisions 90155 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r90155 | tilghman | 2007-11-29 11:29:59 -0600 (Thu, 29 Nov 2007) | 5 lines
Use of "private" as a field name in a header file messes with C++ projects
Reported by: chewbacca
Patch by: casper
(Closes issue #11401)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@90158 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'formats/format_h264.c')
| -rw-r--r-- | formats/format_h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/formats/format_h264.c b/formats/format_h264.c index 519a90636..06def313c 100644 --- a/formats/format_h264.c +++ b/formats/format_h264.c @@ -59,7 +59,7 @@ static struct ast_frame *h264_read(struct ast_filestream *s, int *whennext) int mark=0; unsigned short len; unsigned int ts; - struct h264_desc *fs = (struct h264_desc *)s->private; + struct h264_desc *fs = (struct h264_desc *)s->_private; /* Send a frame from the file to the appropriate channel */ if ((res = fread(&len, 1, sizeof(len), s->f)) < 1) |