diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-16 21:14:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-16 23:30:09 +0100 |
| commit | b7fe35c9e50e1701274364adf7280bf4a02b092b (patch) | |
| tree | 05d5ffb039ce76bbc782d36704bdf8b135df50ce /libavcodec/dxva2_internal.h | |
| parent | ddbbfd95bee4105fcb75f3b7c039b6c08efe36b4 (diff) | |
| parent | 2c541554076cc8a72e7145d4da30389ca763f32f (diff) | |
| download | ffmpeg-b7fe35c9e50e1701274364adf7280bf4a02b092b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: deMpegEncContextize
Conflicts:
libavcodec/dxva2_h264.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_loopfilter.c
libavcodec/h264_mb_template.c
libavcodec/h264_parser.c
libavcodec/h264_ps.c
libavcodec/h264_refs.c
libavcodec/h264_sei.c
libavcodec/svq3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dxva2_internal.h')
| -rw-r--r-- | libavcodec/dxva2_internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dxva2_internal.h b/libavcodec/dxva2_internal.h index 03f7f5dad4..dd1c7ae6be 100644 --- a/libavcodec/dxva2_internal.h +++ b/libavcodec/dxva2_internal.h @@ -54,7 +54,7 @@ int ff_dxva2_commit_buffer(AVCodecContext *, struct dxva_context *, unsigned mb_count); -int ff_dxva2_common_end_frame(AVCodecContext *, MpegEncContext *, +int ff_dxva2_common_end_frame(AVCodecContext *, Picture *, const void *pp, unsigned pp_size, const void *qm, unsigned qm_size, int (*commit_bs_si)(AVCodecContext *, |