diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-16 11:55:22 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-16 11:56:43 +0400 |
commit | efc08e00cc0b05ea478aef51693199bfb0c3b489 (patch) | |
tree | 3d692a005e062de8485b540da1c763355c58b611 /libavformat/rtsp.c | |
parent | 39354d608933fe37a5ec86de4c691bcb46df0dac (diff) | |
parent | b3ea76624ad1baab0b6bcc13f3f856be2f958110 (diff) |
Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110'
* commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110':
vf_aspect: use the name 's' for the pointer to the private context
Remove commented-out debug #define cruft
Conflicts:
libavcodec/4xm.c
libavcodec/dvdsubdec.c
libavcodec/ituh263dec.c
libavcodec/mpeg12.c
libavfilter/avfilter.c
libavfilter/vf_aspect.c
libavfilter/vf_fieldorder.c
libavformat/rtmpproto.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtsp.c')
-rw-r--r-- | libavformat/rtsp.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index a1f047bd0d..6310d79c28 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -49,8 +49,6 @@ #include "rtpenc.h" #include "mpegts.h" -//#define DEBUG - /* Timeout values for socket poll, in ms, * and read_packet(), in seconds */ #define POLL_TIMEOUT_MS 100 |