Avoids implicit inclusions of avcodec.h in lavf/takdec.c and lavc/tak.c.
Unified · Split
| @@ -144,11 +144,11 @@ int avpriv_tak_parse_streaminfo(TAKStreamInfo *s, const uint8_t *buf, int size) · 143 unmodified lines | ||
| 144 | 144 | return tak_parse_streaminfo(s, &gb); |
| 145 | 145 | } |
| 146 | 146 | |
| 147 | −int ff_tak_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb, | |
| 147 | +int ff_tak_decode_frame_header(void *logctx, GetBitContext *gb, | |
| 148 | 148 | TAKStreamInfo *ti, int log_level_offset) |
| 149 | 149 | { |
| 150 | 150 | if (get_bits(gb, TAK_FRAME_HEADER_SYNC_ID_BITS) != TAK_FRAME_HEADER_SYNC_ID) { |
| 151 | − av_log(avctx, AV_LOG_ERROR + log_level_offset, "missing sync id\n"); | |
| 151 | + av_log(logctx, AV_LOG_ERROR + log_level_offset, "missing sync id\n"); | |
| 152 | 152 | return AVERROR_INVALIDDATA; |
| 153 | 153 | } |
| 154 | 154 | |
| @@ -29,7 +29,6 @@ · 28 unmodified lines | ||
| 29 | 29 | |
| 30 | 30 | #include <stdint.h> |
| 31 | 31 | |
| 32 | −#include "avcodec.h" | |
| 33 | 32 | #include "get_bits.h" |
| 34 | 33 | |
| 35 | 34 | #define TAK_FORMAT_DATA_TYPE_BITS 3 |
| @@ -151,13 +150,13 @@ int avpriv_tak_parse_streaminfo(TAKStreamInfo *s, const uint8_t *buf, int size); · 115 unmodified lines | ||
| 151 | 150 | |
| 152 | 151 | /** |
| 153 | 152 | * Validate and decode a frame header. |
| 154 | − * @param avctx AVCodecContext to use as av_log() context | |
| 153 | + * @param logctx for use as av_log() context | |
| 155 | 154 | * @param[in] gb GetBitContext from which to read frame header |
| 156 | 155 | * @param[out] s frame information |
| 157 | 156 | * @param log_level_offset log level offset, can be used to silence |
| 158 | 157 | * error messages. |
| 159 | 158 | * @return non-zero on error, 0 if OK |
| 160 | 159 | */ |
| 161 | −int ff_tak_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb, | |
| 160 | +int ff_tak_decode_frame_header(void *logctx, GetBitContext *gb, | |
| 162 | 161 | TAKStreamInfo *s, int log_level_offset); |
| 163 | 162 | #endif /* AVCODEC_TAK_H */ |