diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-31 13:14:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-31 13:14:06 +0100 |
| commit | 6ddda83c3f9334511e606d4548a8f13816b71184 (patch) | |
| tree | 21d70bff385aecb551120ab3e8d51f51eec7cd63 /libavcodec/utils.c | |
| parent | 87350d6b44b245d6b8cd28dc499d0fb9dbf15dad (diff) | |
| parent | 64bb3fa6b7f5b2db22b7577585d5861be24eebd8 (diff) | |
Merge commit '64bb3fa6b7f5b2db22b7577585d5861be24eebd8'
* commit '64bb3fa6b7f5b2db22b7577585d5861be24eebd8':
cavs: cosmetics, reformat top part
cavsdec: cosmetics, reformat
libavcodec/utils: Add braces to shut up gcc warnings
Conflicts:
libavcodec/cavsdec.c
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 918954a43b..f5ceae4e17 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1296,7 +1296,7 @@ int attribute_align_arg avcodec_encode_audio(AVCodecContext *avctx, const short *samples) { AVPacket pkt; - AVFrame frame0 = {{0}}; + AVFrame frame0 = { { 0 } }; AVFrame *frame; int ret, samples_size, got_packet; @@ -1666,7 +1666,7 @@ int attribute_align_arg avcodec_decode_audio3(AVCodecContext *avctx, int16_t *sa int *frame_size_ptr, AVPacket *avpkt) { - AVFrame frame = {{0}}; + AVFrame frame = { { 0 } }; int ret, got_frame = 0; if (avctx->get_buffer != avcodec_default_get_buffer) { |