mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
mpegts: replace Program_t typedef with "struct Program"
Originally committed as revision 16086 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
8f993c6725
commit
8c39a7582d
@ -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++) {
|
||||
|
Loading…
Reference in New Issue
Block a user