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/Makefile | |
| 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/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index a27bd0c676..66b8127d9a 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -21,7 +21,7 @@ OBJS= common.o utils.o mem.o allcodecs.o \ msvideo1.o vqavideo.o idcinvideo.o adx.o rational.o faandct.o 8bps.o \ smc.o parser.o flicvideo.o truemotion1.o vmdav.o lcl.o qtrle.o g726.o \ flac.o vp3dsp.o integer.o snow.o tscc.o sonic.o ulti.o h264idct.o \ - qdrw.o xl.o rangecoder.o png.o + qdrw.o xl.o rangecoder.o png.o pnm.o ifeq ($(AMR_NB),yes) ifeq ($(AMR_NB_FIXED),yes) |