Merge commit '55f9037f'

* commit '55f9037f':
  avformat: split muxing functions from util.c

Conflicts:
	libavformat/internal.h
	libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavformat/Makefile

@@ -14,6 +14,7 @@ OBJS = allformats.o         \
        id3v1.o              \
        id3v2.o              \
        metadata.o           \
+       mux.o                \
        options.o            \
        os_support.o         \
        riff.o               \

libavformat/internal.h

@@ -346,4 +346,13 @@ int ff_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out,
 
 void ff_free_stream(AVFormatContext *s, AVStream *st);
 
+/**
+ * Return the frame duration in seconds. Return 0 if not available.
+ */
+void ff_compute_frame_duration(int *pnum, int *pden, AVStream *st,
+                               AVCodecParserContext *pc, AVPacket *pkt);
+
+int ff_get_audio_frame_size(AVCodecContext *enc, int size, int mux);
+
+
 #endif /* AVFORMAT_INTERNAL_H */