summaryrefslogtreecommitdiff
path: root/libavformat/rtpdec_amr.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-24 22:11:54 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-24 22:11:58 +0100
commit5d06b6e984706368f1fe3bce38d2dcea1821b7e9 (patch)
tree4c2eb508fab5d9f8bd72a4d740b73f5c8c45cfbd /libavformat/rtpdec_amr.c
parenteb24186b457b6b4e77b5d8ebf10a6654eebc2599 (diff)
parentfe414059ec1fe8237574bed34cdaa8ac3893917b (diff)
Merge commit 'fe414059ec1fe8237574bed34cdaa8ac3893917b'
* commit 'fe414059ec1fe8237574bed34cdaa8ac3893917b': rtpdec_amr: Use the common indentation style Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_amr.c')
-rw-r--r--libavformat/rtpdec_amr.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/rtpdec_amr.c b/libavformat/rtpdec_amr.c
index 31acfe7edc..9f3e49c220 100644
--- a/libavformat/rtpdec_amr.c
+++ b/libavformat/rtpdec_amr.c
@@ -41,7 +41,8 @@ struct PayloadContext {
static PayloadContext *amr_new_context(void)
{
PayloadContext *data = av_mallocz(sizeof(PayloadContext));
- if(!data) return data;
+ if (!data)
+ return data;
data->channels = 1;
return data;
}