diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-12-19 10:37:08 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-12-19 10:37:08 +0100 |
| commit | addc7f72541eaa534e1f0f85666f16ba0ccd4cca (patch) | |
| tree | 1300725167f7d101870578106eca41fdbd39fe18 /ext | |
| parent | 0970bbad497389e152cbe47192e61329d4d3ad9f (diff) | |
Imported Upstream version 1.0.4upstream/1.0.4
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/libav/gstavcodecmap.c | 5 | ||||
| -rw-r--r-- | ext/libav/gstavpipe.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ext/libav/gstavcodecmap.c b/ext/libav/gstavcodecmap.c index 10b310e..7b28800 100644 --- a/ext/libav/gstavcodecmap.c +++ b/ext/libav/gstavcodecmap.c @@ -2608,6 +2608,11 @@ gst_ffmpeg_caps_with_codecid (enum CodecID codec_id, /* QCELP is always mono, no matter what the caps say */ context->channels = 1; break; + case CODEC_ID_ADPCM_G726: + if (context->sample_rate && context->bit_rate) + context->bits_per_coded_sample = + context->bit_rate / context->sample_rate; + break; default: break; } diff --git a/ext/libav/gstavpipe.h b/ext/libav/gstavpipe.h index 09ec57d..5ded77f 100644 --- a/ext/libav/gstavpipe.h +++ b/ext/libav/gstavpipe.h @@ -34,7 +34,7 @@ G_BEGIN_DECLS } G_STMT_END #define GST_FFMPEG_PIPE_MUTEX_UNLOCK(m) G_STMT_START { \ - GST_LOG_OBJECT (&m, "unlocking tlock from thread %p", g_thread_self ()); \ + GST_LOG_OBJECT (m, "unlocking tlock from thread %p", g_thread_self ()); \ g_mutex_unlock (&m->tlock); \ } G_STMT_END |