diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 21:33:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 21:33:27 +0100 |
| commit | 8bdcec31116594b07e83a8845b64a5e8172884f2 (patch) | |
| tree | dbeed6cee87d40ab8d9c1ded0df65d7043068846 /libavcodec/h264.h | |
| parent | b1e6d8a226524a7477b626e51e4982fc72f295d9 (diff) | |
| parent | 51d8725a6e4c7f989d6f0f38b59cb54a2d72846c (diff) | |
| download | ffmpeg-streaming-8bdcec31116594b07e83a8845b64a5e8172884f2.zip ffmpeg-streaming-8bdcec31116594b07e83a8845b64a5e8172884f2.tar.gz | |
Merge commit '51d8725a6e4c7f989d6f0f38b59cb54a2d72846c'
* commit '51d8725a6e4c7f989d6f0f38b59cb54a2d72846c':
h264: use the main H264Context as the parent for all slice contexts
Conflicts:
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 2df2dfa..6ceb9dd 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -1171,7 +1171,7 @@ int ff_init_poc(H264Context *h, int pic_field_poc[2], int *pic_poc); int ff_pred_weight_table(H264Context *h, H264SliceContext *sl); int ff_set_ref_count(H264Context *h, H264SliceContext *sl); -int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl, H264Context *h0); +int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl); #define SLICE_SINGLETHREAD 1 #define SLICE_SKIPED 2 |
