Merge remote-tracking branch 'alarmpi/pi'

This commit is contained in:
Iwan Timmer
2017-05-31 20:03:55 +02:00
3 changed files with 3 additions and 2 deletions

View File

@@ -123,6 +123,7 @@ static int omx_renderer_init(int audioConfiguration, POPUS_MULTISTREAM_CONFIGURA
}
OMX_CONFIG_BRCMAUDIODESTINATIONTYPE arDest;
char* audio_device = (char*) context;
if (audio_device == NULL)
audio_device = "hdmi";

View File

@@ -115,7 +115,7 @@ static int frame_handle(int pipefd) {
return LOOP_OK;
}
int void decoder_renderer_setup(int videoFormat, int width, int height, int redrawRate, void* context, int drFlags) {
int decoder_renderer_setup(int videoFormat, int width, int height, int redrawRate, void* context, int drFlags) {
if (videoFormat != VIDEO_FORMAT_H264) {
fprintf(stderr, "Video format not supported\n");
return -1;

View File

@@ -53,7 +53,7 @@ static unsigned char *dest;
static int port_settings_changed;
static int first_packet;
int void decoder_renderer_setup(int videoFormat, int width, int height, int redrawRate, void* context, int drFlags) {
int decoder_renderer_setup(int videoFormat, int width, int height, int redrawRate, void* context, int drFlags) {
if (videoFormat != VIDEO_FORMAT_H264) {
fprintf(stderr, "Video format not supported\n");
return -1;