diff options
author | Olle Johansson <oej@edvina.net> | 2007-01-08 11:49:23 +0000 |
---|---|---|
committer | Olle Johansson <oej@edvina.net> | 2007-01-08 11:49:23 +0000 |
commit | 68ff3c3575cb378033d6d6617424197343770f65 (patch) | |
tree | d6b91bbbd4d1ab7934aeff2e4b76e12f3b743271 /main/frame.c | |
parent | 975dba04bc566bc85ac40866cabd7e0c70efa26a (diff) |
Issue #8663 - Add passthrough support for MPEG4 (neutrino88).
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49968 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/frame.c')
-rw-r--r-- | main/frame.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/main/frame.c b/main/frame.c index 39ba8cdad..6471f1913 100644 --- a/main/frame.c +++ b/main/frame.c @@ -124,10 +124,11 @@ static struct ast_format_list AST_FORMAT_LIST[] = { /*!< Bit number: comment { 0, AST_FORMAT_MAX_AUDIO, "maxaudio", "Maximum audio format" }, { 1, AST_FORMAT_JPEG, "jpeg", "JPEG image"}, /*!< 17: See format_jpeg.c */ { 1, AST_FORMAT_PNG, "png", "PNG image"}, /*!< 18: Image format */ - { 1, AST_FORMAT_H261, "h261", "H.261 Video" }, /*!< 19: Video Passthrough */ - { 1, AST_FORMAT_H263, "h263", "H.263 Video" }, /*!< 20: Passthrough support, see format_h263.c */ - { 1, AST_FORMAT_H263_PLUS, "h263p", "H.263+ Video" }, /*!< 21: See format_h263.c */ + { 1, AST_FORMAT_H261, "h261", "H.261 Video" }, /*!< 19: H.261 Video Passthrough */ + { 1, AST_FORMAT_H263, "h263", "H.263 Video" }, /*!< 20: H.263 Passthrough support, see format_h263.c */ + { 1, AST_FORMAT_H263_PLUS, "h263p", "H.263+ Video" }, /*!< 21: H.263plus passthrough support See format_h263.c */ { 1, AST_FORMAT_H264, "h264", "H.264 Video" }, /*!< 22: Passthrough support, see format_h263.c */ + { 1, AST_FORMAT_MP4_VIDEO, "mpeg4", "MPEG4 Video" }, /*!< Passthrough support for MPEG4 */ { 0, 0, "nothing", "undefined" }, { 0, 0, "nothing", "undefined" }, { 0, 0, "nothing", "undefined" }, |