summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Hervey <bilboed@bilboed.com>2015-02-12 14:48:10 +0100
committerEdward Hervey <bilboed@bilboed.com>2015-03-11 10:39:38 +0100
commit48658919b4642bb2064c8348d66f8651f6dcebd3 (patch)
tree17edb6158dfd7d94a0e6e9c0718f5ae6a3fd487e
parent22802107fdad26b3cd0fa50cb33e9d04256ab0aa (diff)
androidmedia: Use the proper input state
When configuring the decoder output state we need to give it the corresponding input state. This is only stored to self->input_state *after* this call. Fixes double re-negotiation (once without proper PAR/fps, once with proper PAR/fps)
-rw-r--r--sys/androidmedia/gstamcvideodec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/androidmedia/gstamcvideodec.c b/sys/androidmedia/gstamcvideodec.c
index 0e9485125..e6f61875a 100644
--- a/sys/androidmedia/gstamcvideodec.c
+++ b/sys/androidmedia/gstamcvideodec.c
@@ -1233,7 +1233,7 @@ gst_amc_video_dec_set_format (GstVideoDecoder * decoder,
GstVideoCodecState *output_state;
output_state =
gst_video_decoder_set_output_state (decoder, GST_VIDEO_FORMAT_RGBA,
- state->info.width, state->info.height, self->input_state);
+ state->info.width, state->info.height, state);
/* at this point state->caps is NULL */
if (output_state->caps)