diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2004-11-11 18:09:28 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-11-11 18:09:28 +0000 |
| commit | 5b6d5596807e546d87f0afd1fb760b0f887b5c97 (patch) | |
| tree | 5dd9a2ecb25fed8a62a58e5e11eb840a0cea76aa /libavcodec/avcodec.h | |
| parent | 6c3890b6d34ee0ee00db710b79454e4ada6c586c (diff) | |
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
Originally committed as revision 3668 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 9f50745206..a379b527ce 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -154,6 +154,11 @@ enum CodecID { CODEC_ID_XVID, CODEC_ID_PNG, + CODEC_ID_PPM, + CODEC_ID_PBM, + CODEC_ID_PGM, + CODEC_ID_PGMYUV, + CODEC_ID_PAM, }; /* CODEC_ID_MP3LAME is absolete */ @@ -1798,6 +1803,11 @@ extern AVCodec dvvideo_encoder; extern AVCodec mjpeg_encoder; extern AVCodec ljpeg_encoder; extern AVCodec png_encoder; +extern AVCodec ppm_encoder; +extern AVCodec pgm_encoder; +extern AVCodec pgmyuv_encoder; +extern AVCodec pbm_encoder; +extern AVCodec pam_encoder; extern AVCodec mpeg4_encoder; extern AVCodec msmpeg4v1_encoder; extern AVCodec msmpeg4v2_encoder; |