mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-25 04:30:02 +00:00
Merge commit '6354957a95022864746180525680cca872ab0e0a'
* commit '6354957a95022864746180525680cca872ab0e0a': dnxhdenc: Have function pointer prototype match implementation Merged-by: Clément Bœsch <cboesch@gopro.com>
This commit is contained in:
commit
77248d1218
@ -26,6 +26,8 @@
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include "mpegvideo.h"
|
||||
#include "dnxhddata.h"
|
||||
|
||||
@ -99,8 +101,8 @@ typedef struct DNXHDEncContext {
|
||||
RCCMPEntry *mb_cmp_tmp;
|
||||
RCEntry *mb_rc;
|
||||
|
||||
void (*get_pixels_8x4_sym)(int16_t * /* align 16 */,
|
||||
const uint8_t *, ptrdiff_t);
|
||||
void (*get_pixels_8x4_sym)(int16_t *av_restrict /* align 16 */ block,
|
||||
const uint8_t *pixels, ptrdiff_t line_size);
|
||||
} DNXHDEncContext;
|
||||
|
||||
void ff_dnxhdenc_init_x86(DNXHDEncContext *ctx);
|
||||
|
Loading…
Reference in New Issue
Block a user