---
libavformat/amr.c | 26 ++++++++++++--------------
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/libavformat/amr.c b/libavformat/amr.c
index 3b1a468..2fee672 100644
--- a/libavformat/amr.c
+++ b/libavformat/amr.c
@@ -57,8 +57,20 @@ static int amr_write_packet(AVFormatContext *s, AVPacket
*pkt)
avio_write(s->pb, pkt->data, pkt->size);
return 0;
}
+
+AVOutputFormat ff_amr_muxer = {
+ .name = "amr",
+ .long_name = NULL_IF_CONFIG_SMALL("3GPP AMR"),
+ .mime_type = "audio/amr",
+ .extensions = "amr",
+ .audio_codec = AV_CODEC_ID_AMR_NB,
+ .video_codec = AV_CODEC_ID_NONE,
+ .write_header = amr_write_header,
+ .write_packet = amr_write_packet,
+};
#endif /* CONFIG_AMR_MUXER */
+#if CONFIG_AMR_DEMUXER
static int amr_probe(AVProbeData *p)
{
// Only check for "#!AMR" which could be amr-wb, amr-nb.
@@ -155,7 +167,6 @@ static int amr_read_packet(AVFormatContext *s, AVPacket
*pkt)
return 0;
}
-#if CONFIG_AMR_DEMUXER
AVInputFormat ff_amr_demuxer = {
.name = "amr",
.long_name = NULL_IF_CONFIG_SMALL("3GPP AMR"),
@@ -165,16 +176,3 @@ AVInputFormat ff_amr_demuxer = {
.flags = AVFMT_GENERIC_INDEX,
};
#endif
-
-#if CONFIG_AMR_MUXER
-AVOutputFormat ff_amr_muxer = {
- .name = "amr",
- .long_name = NULL_IF_CONFIG_SMALL("3GPP AMR"),
- .mime_type = "audio/amr",
- .extensions = "amr",
- .audio_codec = AV_CODEC_ID_AMR_NB,
- .video_codec = AV_CODEC_ID_NONE,
- .write_header = amr_write_header,
- .write_packet = amr_write_packet,
-};
-#endif
--
1.8.3.2
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
