Merge commit '7941159df6aad2d219e2a7184489be7a735dd944'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Dec 2012 11:06:19 +0000 (12:06 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Dec 2012 11:06:19 +0000 (12:06 +0100)
* 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>
1  2 
libavformat/rtpdec.c
libavformat/rtpdec.h
libavformat/rtpenc.h

Simple merge
Simple merge
Simple merge