diff options
author | Tomas Härdin <tomas.hardin@codemill.se> | 2010-06-10 08:39:05 +0000 |
---|---|---|
committer | Tomas Härdin <tomas.hardin@codemill.se> | 2010-06-10 08:39:05 +0000 |
commit | c1bdc9300b3c0b05d49a8a0e34a5249dfe1544f3 (patch) | |
tree | b88ac3fbb69cf6100956e68393eab3e6fdcc95b3 /libavcodec/avcodec.h | |
parent | bb5cfc48f1f95eacd093b447cca4a451c396905b (diff) | |
download | ffmpeg-c1bdc9300b3c0b05d49a8a0e34a5249dfe1544f3.tar.gz |
avcodec.h: Clarify AVCodecContext::pix_fmt documentation since its value may be set by the demuxer
rawdec.c: Only perform bits_per_coded_sample -> pix_fmt guesswork if pix_fmt hasn't been set
Originally committed as revision 23561 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r-- | libavcodec/avcodec.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 5e77fb3592..ffc2e07ce8 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1121,8 +1121,10 @@ typedef struct AVCodecContext { /** * Pixel format, see PIX_FMT_xxx. + * May be set by the demuxer if known from headers. + * May be overriden by the decoder if it knows better. * - encoding: Set by user. - * - decoding: Set by libavcodec. + * - decoding: Set by user if known, overridden by libavcodec if known */ enum PixelFormat pix_fmt; |