diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-13 12:06:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-13 12:06:19 +0100 |
| commit | de7c95d551881a01cd24885f23bd180fcecc5c07 (patch) | |
| tree | 055b89369fb437790d85ee55ad8773e5b4ae7283 /libavformat/rtpenc.h | |
| parent | 9c0ec23c7dde8a2d6a356fa21cf3339b208467cf (diff) | |
| parent | 7941159df6aad2d219e2a7184489be7a735dd944 (diff) | |
| download | ffmpeg-de7c95d551881a01cd24885f23bd180fcecc5c07.tar.gz | |
Merge commit '7941159df6aad2d219e2a7184489be7a735dd944'
* commit '7941159df6aad2d219e2a7184489be7a735dd944':
rtpdec/enc: Remove outdated/useless/misleading comments
rtpdec: Improve some comments
rtpdec: Remove unused context variables
rtpdec: Limit writing to the buffer size
svq1: Fix building with -DDEBUG
svq1: return meaningful error codes.
Conflicts:
libavcodec/svq1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpenc.h')
| -rw-r--r-- | libavformat/rtpenc.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/rtpenc.h b/libavformat/rtpenc.h index bc523b442a..c3607c15a4 100644 --- a/libavformat/rtpenc.h +++ b/libavformat/rtpenc.h @@ -38,13 +38,13 @@ struct RTPMuxContext { int num_frames; /* rtcp sender statistics receive */ - int64_t last_rtcp_ntp_time; // TODO: move into statistics - int64_t first_rtcp_ntp_time; // TODO: move into statistics + int64_t last_rtcp_ntp_time; + int64_t first_rtcp_ntp_time; /* rtcp sender statistics */ - unsigned int packet_count; // TODO: move into statistics (outgoing) - unsigned int octet_count; // TODO: move into statistics (outgoing) - unsigned int last_octet_count; // TODO: move into statistics (outgoing) + unsigned int packet_count; + unsigned int octet_count; + unsigned int last_octet_count; int first_packet; /* buffer for output */ uint8_t *buf; |