diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-16 20:31:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-16 20:31:02 +0200 |
| commit | 7d43fbe3aef8594fbc4a07c3990f865bb3e04628 (patch) | |
| tree | d88f1137dad069618df484ad7e8ac1c86f77817b /libavcodec/dca.c | |
| parent | 9bf260b2d2fc758dc639fad04f03d4752d066af8 (diff) | |
| parent | 45ff7c93dd84a254cc96acc589e5ac3d7bd16bce (diff) | |
Merge commit '45ff7c93dd84a254cc96acc589e5ac3d7bd16bce'
* commit '45ff7c93dd84a254cc96acc589e5ac3d7bd16bce':
dca: K&R formatting cosmetics
Conflicts:
libavcodec/dca_parser.c
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dca.c')
| -rw-r--r-- | libavcodec/dca.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/dca.c b/libavcodec/dca.c index f9529760fc..22be88fe1a 100644 --- a/libavcodec/dca.c +++ b/libavcodec/dca.c @@ -30,8 +30,7 @@ #include "dca.h" #include "put_bits.h" -const uint32_t avpriv_dca_sample_rates[16] = -{ +const uint32_t avpriv_dca_sample_rates[16] = { 0, 8000, 16000, 32000, 0, 0, 11025, 22050, 44100, 0, 0, 12000, 24000, 48000, 96000, 192000 }; |