apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2026-04-25 08:56:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '7941159df6aad2d219e2a7184489be7a735dd944'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2012-12-13 12:06:19 +01:00
parent 9c0ec23c7d 7941159df6
commit de7c95d551
3 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavformat/rtpdec.c
+1 -1
View File
@@ -531,7 +531,7 @@ static int rtp_parse_packet_internal(RTPDemuxContext *s, AVPacket *pkt,
if (ret < 0)
return AVERROR(EAGAIN);
if (ret < len) {
s->read_buf_size = len - ret;
s->read_buf_size = FFMIN(len - ret, sizeof(s->buf));
memcpy(s->buf, buf + ret, s->read_buf_size);
s->read_buf_index = 0;
return 1;