diff options
| author | Diego Biurrun <diego@biurrun.de> | 2008-12-03 16:47:07 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2008-12-03 16:47:07 +0000 |
| commit | bad406374038d9edef171a3ff4cfb54464edbc10 (patch) | |
| tree | 3cc540da6d9544fd386eb108ce7c14b8d99d2560 | |
| parent | 376924583a8334f2ba1529114333ef89ac8b53de (diff) | |
| download | ffmpeg-bad406374038d9edef171a3ff4cfb54464edbc10.tar.gz | |
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
| -rw-r--r-- | libavformat/internal.h | 4 | ||||
| -rw-r--r-- | libavformat/mpegts.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/internal.h b/libavformat/internal.h index a96f365e34..cb266caed0 100644 --- 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 f1212853ba..799f4bbd65 100644 --- 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, |