[FFmpeg-cvslog] Merge commit '90c784cc13f6bf21a8eb69f3b88b50c7a70f6c59'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 21 17:46:43 2012 +0100| [bb3420d88e71ee9bb04166467dde3056ff3aa2b6] | committer: Michael Niedermayer

Merge commit '90c784cc13f6bf21a8eb69f3b88b50c7a70f6c59'

* commit '90c784cc13f6bf21a8eb69f3b88b50c7a70f6c59':
  rtpdec: Pass the sequence number to depacketizers
  configure: Make avconv depend on null, anull and resample filters

Conflicts:
	configure

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

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