aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/h264_parse.h
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2016-05-18 09:40:33 +0200
committerAnton Khirnov <anton@khirnov.net>2016-06-21 11:13:29 +0200
commitf638b67e5790735f34620bf82025c9b9d6fc7216 (patch)
treead69a1e8304a70e74bc6d57f83cd8c28d7cdae77 /libavcodec/h264_parse.h
parent4e2f6212483ae1b2a4043cddf0a1cb001b476abc (diff)
downloadffmpeg-f638b67e5790735f34620bf82025c9b9d6fc7216.tar.gz
h264: move the parameter set definitions to a new header file
The PS parsing code is independent from the decoder, so it makes more sense for it to have its own separate header.
Diffstat (limited to 'libavcodec/h264_parse.h')
-rw-r--r--libavcodec/h264_parse.h15
1 files changed, 6 insertions, 9 deletions
diff --git a/libavcodec/h264_parse.h b/libavcodec/h264_parse.h
index fde1a45be9..5c6024d0dc 100644
--- a/libavcodec/h264_parse.h
+++ b/libavcodec/h264_parse.h
@@ -25,6 +25,7 @@
#define AVCODEC_H264_PARSE_H
#include "get_bits.h"
+#include "h264_ps.h"
typedef struct H264PredWeightTable {
int use_weight;
@@ -52,11 +53,7 @@ typedef struct H264POCContext {
int prev_frame_num; ///< frame_num of the last pic for POC type 1/2
} H264POCContext;
-struct SPS;
-struct PPS;
-struct H264ParamSets;
-
-int ff_h264_pred_weight_table(GetBitContext *gb, const struct SPS *sps,
+int ff_h264_pred_weight_table(GetBitContext *gb, const SPS *sps,
const int *ref_count, int slice_type_nos,
H264PredWeightTable *pwt);
@@ -76,20 +73,20 @@ int ff_h264_check_intra_pred_mode(void *logctx, int top_samples_available,
int mode, int is_chroma);
int ff_h264_parse_ref_count(int *plist_count, int ref_count[2],
- GetBitContext *gb, const struct PPS *pps,
+ GetBitContext *gb, const PPS *pps,
int slice_type_nos, int picture_structure);
int ff_h264_init_poc(int pic_field_poc[2], int *pic_poc,
- const struct SPS *sps, H264POCContext *poc,
+ const SPS *sps, H264POCContext *poc,
int picture_structure, int nal_ref_idc);
-int ff_h264_decode_extradata(const uint8_t *data, int size, struct H264ParamSets *ps,
+int ff_h264_decode_extradata(const uint8_t *data, int size, H264ParamSets *ps,
int *is_avc, int *nal_length_size,
int err_recognition, void *logctx);
/**
* compute profile from sps
*/
-int ff_h264_get_profile(const struct SPS *sps);
+int ff_h264_get_profile(const SPS *sps);
#endif /* AVCODEC_H264_PARSE_H */