Merge commit '90c784cc13f6bf21a8eb69f3b88b50c7a70f6c59'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 21 Dec 2012 16:46:43 +0000 (17:46 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 21 Dec 2012 16:46:43 +0000 (17:46 +0100)
* 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@gmx.at>
17 files changed:
1  2 
libavformat/rdt.c
libavformat/rtpdec.c
libavformat/rtpdec.h
libavformat/rtpdec_amr.c
libavformat/rtpdec_asf.c
libavformat/rtpdec_formats.h
libavformat/rtpdec_h263.c
libavformat/rtpdec_h264.c
libavformat/rtpdec_jpeg.c
libavformat/rtpdec_latm.c
libavformat/rtpdec_mpeg4.c
libavformat/rtpdec_qcelp.c
libavformat/rtpdec_qdm2.c
libavformat/rtpdec_qt.c
libavformat/rtpdec_svq3.c
libavformat/rtpdec_vp8.c
libavformat/rtpdec_xiph.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge