diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 13:01:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 13:23:45 +0200 |
| commit | ab7ad5e6a1b8359b169e7bcbe96ce7162d0c0002 (patch) | |
| tree | 884b721a07e241495ab86a2317d929a8b71dbee8 /libavcodec/h264.h | |
| parent | 580c86925ddf8c85d2e6f57ed55dd75853748b29 (diff) | |
| parent | ee62b364be0c30cba83b5ff10a3ca8c3e866ade6 (diff) | |
| download | ffmpeg-streaming-ab7ad5e6a1b8359b169e7bcbe96ce7162d0c0002.zip ffmpeg-streaming-ab7ad5e6a1b8359b169e7bcbe96ce7162d0c0002.tar.gz | |
Merge commit 'ee62b364be0c30cba83b5ff10a3ca8c3e866ade6'
* commit 'ee62b364be0c30cba83b5ff10a3ca8c3e866ade6':
h264: eliminate ff_h264_set_parameter_from_sps()
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 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 6eb27d7..5026ab2 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -1168,7 +1168,6 @@ int ff_h264_ref_picture(H264Context *h, H264Picture *dst, H264Picture *src); void ff_h264_unref_picture(H264Context *h, H264Picture *pic); int ff_h264_slice_context_init(H264Context *h, H264SliceContext *sl); -int ff_h264_set_parameter_from_sps(H264Context *h); void ff_h264_draw_horiz_band(const H264Context *h, H264SliceContext *sl, int y, int height); int ff_init_poc(H264Context *h, int pic_field_poc[2], int *pic_poc); |
