Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 18:40:08 +0000 (19:40 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 18:40:20 +0000 (19:40 +0100)
* qatar/master:
  rtspenc: Make sure BYE packets are sent before TEARDOWN

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/rtsp.c
libavformat/rtsp.h
libavformat/rtspdec.c
libavformat/rtspenc.c

Simple merge
Simple merge
Simple merge
Simple merge