diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 17:05:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 17:08:40 +0100 |
| commit | 3c831fba08698293034db5ecaf8d74aa5fe453f8 (patch) | |
| tree | 8e42a1e32c1f1a7b547855048a809f7e5468cece /libavcodec/avcodec.h | |
| parent | a76440239428190a6a5b303f0e87a7e1ae2cc881 (diff) | |
| parent | e44b58924fe7b180bf8b0c277c15d1a58210a0e9 (diff) | |
Merge commit 'e44b58924fe7b180bf8b0c277c15d1a58210a0e9'
* commit 'e44b58924fe7b180bf8b0c277c15d1a58210a0e9':
lavc: deprecate unused AVCodecContext.stream_codec_tag
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 99467bb069..5c21430ba1 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1260,13 +1260,13 @@ typedef struct AVCodecContext { */ unsigned int codec_tag; +#if FF_API_STREAM_CODEC_TAG /** - * fourcc from the AVI stream header (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A'). - * This is used to work around some encoder bugs. - * - encoding: unused - * - decoding: Set by user, will be converted to uppercase by libavcodec during init. + * @deprecated this field is unused */ + attribute_deprecated unsigned int stream_codec_tag; +#endif void *priv_data; |