Move declaration of av_set_program_name and av_program_add_stream_index

to a more sensible place.

Originally committed as revision 15991 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/internal.h b/libavformat/internal.h
index a96f365..cb266ca 100644 (file)
--- a/libavformat/internal.h
+++ b/libavformat/internal.h
@@ -22,7 +22,11 @@
 #define AVFORMAT_INTERNAL_H
 
 #include <stdint.h>
+#include "avformat.h"
 
 char *ff_data_to_hex(char *buf, const uint8_t *src, int size);
 
+void av_set_program_name(AVProgram *program, char *provider_name, char *name);
+void av_program_add_stream_index(AVFormatContext *ac, int progid, unsigned int idx);
+
 #endif /* AVFORMAT_INTERNAL_H */

diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index f121285..799f4bb 100644 (file)
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -38,8 +38,6 @@ typedef struct PESContext PESContext;
 
 static PESContext* add_pes_stream(MpegTSContext *ts, int pid, int pcr_pid, int stream_type);
 static AVStream* new_pes_av_stream(PESContext *pes, uint32_t code);
-void av_set_program_name(AVProgram *program, char *provider_name, char *name);
-void av_program_add_stream_index(AVFormatContext *ac, int progid, unsigned int idx);
 
 enum MpegTSFilterType {
     MPEGTS_PES,