[FFmpeg-cvslog] Merge commit 'ba0c72a9ae1e2954e5dcf920f7b4e9a8f8a22f3e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 15 14:42:20 2013 +0100| [8686b6c68bacfdd9ffa89736756192188973ad5d] | committer: Michael Niedermayer

Merge commit 'ba0c72a9ae1e2954e5dcf920f7b4e9a8f8a22f3e'

* commit 'ba0c72a9ae1e2954e5dcf920f7b4e9a8f8a22f3e':
  build: Remove stray Makefile entry for non-existent VCR1 encoder
  rtpdec: Handle more received packets than expected when sending RR

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8686b6c68bacfdd9ffa89736756192188973ad5d
---