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)
commit1295377f0a9de3140330d4467347f10d03ec4169
tree8b5b652ae983e4b56fa685a828d81b7707fa5d7e
parent04894ef32e325e33d420e15c16e3714e0f95fdb0
parent50aef03b24d949249b020226dffa3a78077f1056
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtspenc: Make sure BYE packets are sent before TEARDOWN

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