Mercurial > libavformat.hg

comparison avformat.h @ 583:7793767ffe35 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
move p*m from image/lavf -> image2/lavc video/audio_codec_id in AVFormatParameters to override/help demuxer av_guess_codec() to guess the default codecs based upon muxer + filename
author michael
date Thu, 11 Nov 2004 18:09:28 +0000
parents 4a755492b90b
children 89a09ede50ad
comparison
equal deleted inserted replaced
582:c5ff083848b4 583:7793767ffe35
3 3
4 #ifdef __cplusplus 4 #ifdef __cplusplus
5 extern "C" { 5 extern "C" {
6 #endif 6 #endif
7 7
8 #define LIBAVFORMAT_BUILD 4620 8 #define LIBAVFORMAT_BUILD 4621
9 9
10 #define LIBAVFORMAT_VERSION_INT FFMPEG_VERSION_INT 10 #define LIBAVFORMAT_VERSION_INT FFMPEG_VERSION_INT
11 #define LIBAVFORMAT_VERSION FFMPEG_VERSION 11 #define LIBAVFORMAT_VERSION FFMPEG_VERSION
12 #define LIBAVFORMAT_IDENT "FFmpeg" FFMPEG_VERSION "b" AV_STRINGIFY(LIBAVFORMAT_BUILD) 12 #define LIBAVFORMAT_IDENT "FFmpeg" FFMPEG_VERSION "b" AV_STRINGIFY(LIBAVFORMAT_BUILD)
13 13
113 int mpeg2ts_compute_pcr:1; /* compute exact PCR for each transport 113 int mpeg2ts_compute_pcr:1; /* compute exact PCR for each transport
114 stream packet (only meaningful if 114 stream packet (only meaningful if
115 mpeg2ts_raw is TRUE */ 115 mpeg2ts_raw is TRUE */
116 int initial_pause:1; /* do not begin to play the stream 116 int initial_pause:1; /* do not begin to play the stream
117 immediately (RTSP only) */ 117 immediately (RTSP only) */
118 enum CodecID video_codec_id;
119 enum CodecID audio_codec_id;
118 } AVFormatParameters; 120 } AVFormatParameters;
119 121
120 #define AVFMT_NOFILE 0x0001 /* no file should be opened */ 122 #define AVFMT_NOFILE 0x0001 /* no file should be opened */
121 #define AVFMT_NEEDNUMBER 0x0002 /* needs '%d' in filename */ 123 #define AVFMT_NEEDNUMBER 0x0002 /* needs '%d' in filename */
122 #define AVFMT_SHOW_IDS 0x0008 /* show format stream IDs numbers */ 124 #define AVFMT_SHOW_IDS 0x0008 /* show format stream IDs numbers */
356 } AVImageFormat; 358 } AVImageFormat;
357 359
358 void av_register_image_format(AVImageFormat *img_fmt); 360 void av_register_image_format(AVImageFormat *img_fmt);
359 AVImageFormat *av_probe_image_format(AVProbeData *pd); 361 AVImageFormat *av_probe_image_format(AVProbeData *pd);
360 AVImageFormat *guess_image_format(const char *filename); 362 AVImageFormat *guess_image_format(const char *filename);
363 enum CodecID av_guess_image2_codec(const char *filename);
361 int av_read_image(ByteIOContext *pb, const char *filename, 364 int av_read_image(ByteIOContext *pb, const char *filename,
362 AVImageFormat *fmt, 365 AVImageFormat *fmt,
363 int (*alloc_cb)(void *, AVImageInfo *info), void *opaque); 366 int (*alloc_cb)(void *, AVImageInfo *info), void *opaque);
364 int av_write_image(ByteIOContext *pb, AVImageFormat *fmt, AVImageInfo *img); 367 int av_write_image(ByteIOContext *pb, AVImageFormat *fmt, AVImageInfo *img);
365 368
519 void av_register_output_format(AVOutputFormat *format); 522 void av_register_output_format(AVOutputFormat *format);
520 AVOutputFormat *guess_stream_format(const char *short_name, 523 AVOutputFormat *guess_stream_format(const char *short_name,
521 const char *filename, const char *mime_type); 524 const char *filename, const char *mime_type);
522 AVOutputFormat *guess_format(const char *short_name, 525 AVOutputFormat *guess_format(const char *short_name,
523 const char *filename, const char *mime_type); 526 const char *filename, const char *mime_type);
527 enum CodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name,
528 const char *filename, const char *mime_type, enum CodecType type);
524 529
525 void av_hex_dump(FILE *f, uint8_t *buf, int size); 530 void av_hex_dump(FILE *f, uint8_t *buf, int size);
526 void av_pkt_dump(FILE *f, AVPacket *pkt, int dump_payload); 531 void av_pkt_dump(FILE *f, AVPacket *pkt, int dump_payload);
527 532
528 void av_register_all(void); 533 void av_register_all(void);