diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-16 12:51:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-16 12:51:26 +0200 |
| commit | f7f74a37b82d7905e49aeb8beed02a9966f15ef6 (patch) | |
| tree | 8dcf232b8665fd2dc9d9f8e99d83eb6bcf6ebe5b /libavcodec/h264.h | |
| parent | 91248f081f343cde894a9c60624b6f4dc4581c94 (diff) | |
| parent | 4baba6c813b7a1f27370e20fb1a87b05fcb39208 (diff) | |
| download | ffmpeg-f7f74a37b82d7905e49aeb8beed02a9966f15ef6.tar.gz | |
Merge commit '4baba6c813b7a1f27370e20fb1a87b05fcb39208'
* commit '4baba6c813b7a1f27370e20fb1a87b05fcb39208':
h264_parser: Fix POC parsing for the case where MMCO_RESET is present.
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index f1db519e47..4324bd314e 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -1011,5 +1011,7 @@ static av_always_inline int get_dct8x8_allowed(H264Context *h) void ff_h264_draw_horiz_band(H264Context *h, int y, int height); int ff_init_poc(H264Context *h, int pic_field_poc[2], int *pic_poc); +int ff_pred_weight_table(H264Context *h); +int ff_set_ref_count(H264Context *h); #endif /* AVCODEC_H264_H */ |