diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-11 14:04:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-11 14:04:10 +0200 |
| commit | bad101ab8a54dd36d569daef35f8e583500bbf49 (patch) | |
| tree | a8d7ac676897e6b29f857bd91bc8f7416938bb56 /libavcodec/dnxhddata.c | |
| parent | d9fef740bd6a5aa2a3ce1a612348a05c4c5ca6e9 (diff) | |
| parent | 89ef08c992c484a46711b1a68a988303679c288e (diff) | |
| download | ffmpeg-bad101ab8a54dd36d569daef35f8e583500bbf49.tar.gz | |
Merge commit '89ef08c992c484a46711b1a68a988303679c288e'
* commit '89ef08c992c484a46711b1a68a988303679c288e':
DNxHD: K&R formatting cosmetics
Conflicts:
libavcodec/dnxhd_parser.c
libavcodec/dnxhddec.c
libavcodec/dnxhdenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dnxhddata.c')
| -rw-r--r-- | libavcodec/dnxhddata.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dnxhddata.c b/libavcodec/dnxhddata.c index 80f5337288..7ea91915e2 100644 --- a/libavcodec/dnxhddata.c +++ b/libavcodec/dnxhddata.c @@ -1067,7 +1067,7 @@ int avpriv_dnxhd_get_frame_size(int cid) int ff_dnxhd_find_cid(AVCodecContext *avctx, int bit_depth) { int i, j; - int mbs = avctx->bit_rate/1000000; + int mbs = avctx->bit_rate / 1000000; if (!mbs) return 0; for (i = 0; i < FF_ARRAY_ELEMS(ff_dnxhd_cid_table); i++) { |