From 8c39a7582d8ca36a8786ec5c61eefc1b86f3973b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= <mans@mansr.com>
Date: Sat, 13 Dec 2008 00:04:34 +0000
Subject: [PATCH] mpegts: replace Program_t typedef with "struct Program"
Originally committed as revision 16086 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/mpegts.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 90e17daad80..00ce336eb1f 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -79,11 +79,11 @@ struct MpegTSFilter {
};
#define MAX_PIDS_PER_PROGRAM 64
-typedef struct {
+struct Program {
unsigned int id; //program id/service id
unsigned int nb_pids;
unsigned int pids[MAX_PIDS_PER_PROGRAM];
-} Program_t;
+};
struct MpegTSContext {
/* user data */
@@ -113,7 +113,7 @@ struct MpegTSContext {
/* scan context */
/** structure to keep track of Program->pids mapping */
unsigned int nb_prg;
- Program_t *prg;
+ struct Program *prg;
/** filters for various streams specified by PMT + for the PAT and PMT */
@@ -168,8 +168,8 @@ static void clear_programs(MpegTSContext *ts)
static void add_pat_entry(MpegTSContext *ts, unsigned int programid)
{
- Program_t *p;
- void *tmp = av_realloc(ts->prg, (ts->nb_prg+1)*sizeof(Program_t));
+ struct Program *p;
+ void *tmp = av_realloc(ts->prg, (ts->nb_prg+1)*sizeof(struct Program));
if(!tmp)
return;
ts->prg = tmp;
@@ -182,7 +182,7 @@ static void add_pat_entry(MpegTSContext *ts, unsigned int programid)
static void add_pid_to_pmt(MpegTSContext *ts, unsigned int programid, unsigned int pid)
{
int i;
- Program_t *p = NULL;
+ struct Program *p = NULL;
for(i=0; i<ts->nb_prg; i++) {
if(ts->prg[i].id == programid) {
p = &ts->prg[i];
@@ -209,7 +209,7 @@ static int discard_pid(MpegTSContext *ts, unsigned int pid)
{
int i, j, k;
int used = 0, discarded = 0;
- Program_t *p;
+ struct Program *p;
for(i=0; i<ts->nb_prg; i++) {
p = &ts->prg[i];
for(j=0; j<p->nb_pids; j++) {
--
GitLab