diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-10 21:05:49 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-10 21:05:49 +0200 |
commit | 544f8114534457e2d2ea04aaffa3b4986d6c8130 (patch) | |
tree | 56eae48cb3099e89d1bed61311b7fb753cf6ca55 /CREDITS | |
parent | cec7afd03640f7296af1f1f3a3b20845ce37ee39 (diff) | |
parent | c27328e749ff3be648411765cd17362fee017341 (diff) | |
download | ffmpeg-544f8114534457e2d2ea04aaffa3b4986d6c8130.tar.gz |
Merge commit 'c27328e749ff3be648411765cd17362fee017341'
* commit 'c27328e749ff3be648411765cd17362fee017341':
rtsp: Check for command strings without spaces
Conflicts:
libavformat/rtspdec.c
See: a0568ed2544025de3c66dd500811f5ba43f38af4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'CREDITS')
0 files changed, 0 insertions, 0 deletions