diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-27 14:23:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-27 14:29:03 +0200 |
| commit | e760424ddd202e01119592044394d505810ae00a (patch) | |
| tree | 448d22660a84f4516c9e1a5caeb66f9005a25a7a /libavformat/rtpdec_speex.c | |
| parent | 00e1afd83f7585f4acb65911100d79e32c1f6fc4 (diff) | |
| parent | 93e81ee81c33e74e6047053f6086d63d2f8293d4 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
nutdec: const correctness for get_v_trace/get_s_trace function arguments
truemotion2: Request samples for old TM2 headers
rtpdec: Remove a useless ff_ prefix from a static symbol
rtpdec: Support depacketizing speex
rtpenc: Add support for packetizing speex
Conflicts:
libavformat/rtpdec.c
libavformat/sdp.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_speex.c')
| -rw-r--r-- | libavformat/rtpdec_speex.c | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/libavformat/rtpdec_speex.c b/libavformat/rtpdec_speex.c deleted file mode 100644 index 4e230906ee..0000000000 --- a/libavformat/rtpdec_speex.c +++ /dev/null @@ -1,39 +0,0 @@ -/* - * RTP SPEEX Depacketizer, RFC 5574 - * Copyright (c) 2012 Dmitry Samonenko - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "avformat.h" -#include "rtpdec_formats.h" -#include "libavutil/avstring.h" - -static int speex_parse_sdp_line(AVFormatContext *s, int st_index, - PayloadContext *data, const char *line) -{ - av_log(s, AV_LOG_WARNING, "fmtp line parsing is not implemented yet\n"); - - return 0; -} - -RTPDynamicProtocolHandler ff_speex_dynamic_handler = { - .enc_name = "speex", - .codec_type = AVMEDIA_TYPE_AUDIO, - .codec_id = AV_CODEC_ID_SPEEX, - .parse_sdp_a_line = speex_parse_sdp_line, -}; |