aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/rtpenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-16 09:55:22 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-16 09:56:43 +0200
commitefc08e00cc0b05ea478aef51693199bfb0c3b489 (patch)
tree3d692a005e062de8485b540da1c763355c58b611 /libavformat/rtpenc.c
parent39354d608933fe37a5ec86de4c691bcb46df0dac (diff)
parentb3ea76624ad1baab0b6bcc13f3f856be2f958110 (diff)
downloadffmpeg-efc08e00cc0b05ea478aef51693199bfb0c3b489.tar.gz
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/rtpenc.c')
-rw-r--r--libavformat/rtpenc.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c
index 7adf687c7f..2c93c206dd 100644
--- a/libavformat/rtpenc.c
+++ b/libavformat/rtpenc.c
@@ -28,8 +28,6 @@
#include "rtpenc.h"
-//#define DEBUG
-
static const AVOption options[] = {
FF_RTP_FLAG_OPTS(RTPMuxContext, flags),
{ "payload_type", "Specify RTP payload type", offsetof(RTPMuxContext, payload_type), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, 127, AV_OPT_FLAG_ENCODING_PARAM },