← Back to branch summary

~ubuntu-branches/ubuntu/lucid/ffmpeg/lucid-security

« back to all changes in this revision

Viewing changes to libavformat/rtp_h264.c

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2009-03-13 09:18:28 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20090313091828-n4ktby5eca487uhv
Tags: 3:0.svn20090303-1ubuntu1+unstripped1
merge from ubuntu.jaunty branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavformat/rtp_h264.c
46
46
#include "network.h"
47
47
#include <assert.h>
48
48
 
49
 
#include "rtp.h"
 
49
#include "rtpdec.h"
50
50
#include "rtp_h264.h"
51
51
 
52
52
/**
159
159
}
160
160
 
161
161
// return 0 on packet, no more left, 1 on packet, 1 on partial packet...
162
 
static int h264_handle_packet(PayloadContext *data,
 
162
static int h264_handle_packet(AVFormatContext *ctx,
 
163
                              PayloadContext *data,
163
164
                              AVStream *st,
164
165
                              AVPacket * pkt,
165
166
                              uint32_t * timestamp,