diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-16 23:42:08 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-16 23:42:18 +0100 |
commit | 571a99de186eac69ed0d6b0eaaaa983cae30765a (patch) | |
tree | c7b10156111e883520f03e1bea820e1db4e48f76 | |
parent | ec9aef565291b1ab6c809030b2697fcbdde79a60 (diff) | |
parent | 2ff302cb6ba1f159905888026c8a1d7dd8319acf (diff) | |
download | ffmpeg-571a99de186eac69ed0d6b0eaaaa983cae30765a.tar.gz |
Merge commit '2ff302cb6ba1f159905888026c8a1d7dd8319acf'
* commit '2ff302cb6ba1f159905888026c8a1d7dd8319acf':
lavc: update coded_frame doxy.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavcodec/avcodec.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 0c573e6c32..f934ee4cc7 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2641,7 +2641,7 @@ typedef struct AVCodecContext { /** * the picture in the bitstream * - encoding: Set by libavcodec. - * - decoding: Set by libavcodec. + * - decoding: unused */ AVFrame *coded_frame; |