diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 16:52:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 16:52:09 +0100 |
| commit | 516f30ed20828c04459cb2fd3b18a0bd2de4cdf0 (patch) | |
| tree | ac3ebb07e51372de8a815b417f89c5c61e135adb /libavcodec | |
| parent | 0ff21c316534776f9b3ba5ae51242ae1a976909e (diff) | |
| parent | 0ee8293a77a6afad161e91ce1d43c4a57ce33a6a (diff) | |
| download | ffmpeg-516f30ed20828c04459cb2fd3b18a0bd2de4cdf0.tar.gz | |
Merge commit '0ee8293a77a6afad161e91ce1d43c4a57ce33a6a'
* commit '0ee8293a77a6afad161e91ce1d43c4a57ce33a6a':
vp3dsp: don't do aligned reads on input.
mlp_parser: cosmetics: re-indent.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mlp_parser.h | 20 | ||||
| -rw-r--r-- | libavcodec/vp3dsp.c | 8 |
2 files changed, 14 insertions, 14 deletions
diff --git a/libavcodec/mlp_parser.h b/libavcodec/mlp_parser.h index 0415ccc7b0..f9638bb868 100644 --- a/libavcodec/mlp_parser.h +++ b/libavcodec/mlp_parser.h @@ -31,13 +31,13 @@ typedef struct MLPHeaderInfo { - int stream_type; ///< 0xBB for MLP, 0xBA for TrueHD + int stream_type; ///< 0xBB for MLP, 0xBA for TrueHD - int group1_bits; ///< The bit depth of the first substream - int group2_bits; ///< Bit depth of the second substream (MLP only) + int group1_bits; ///< The bit depth of the first substream + int group2_bits; ///< Bit depth of the second substream (MLP only) - int group1_samplerate; ///< Sample rate of first substream - int group2_samplerate; ///< Sample rate of second substream (MLP only) + int group1_samplerate; ///< Sample rate of first substream + int group2_samplerate; ///< Sample rate of second substream (MLP only) int channels_mlp; ///< Channel count for MLP streams int channels_thd_stream1; ///< Channel count for substream 1 of TrueHD streams ("6-channel presentation") @@ -46,13 +46,13 @@ typedef struct MLPHeaderInfo uint64_t channel_layout_thd_stream1; ///< Channel layout for substream 1 of TrueHD streams ("6-channel presentation") uint64_t channel_layout_thd_stream2; ///< Channel layout for substream 2 of TrueHD streams ("8-channel presentation") - int access_unit_size; ///< Number of samples per coded frame - int access_unit_size_pow2; ///< Next power of two above number of samples per frame + int access_unit_size; ///< Number of samples per coded frame + int access_unit_size_pow2; ///< Next power of two above number of samples per frame - int is_vbr; ///< Stream is VBR instead of CBR - int peak_bitrate; ///< Peak bitrate for VBR, actual bitrate (==peak) for CBR + int is_vbr; ///< Stream is VBR instead of CBR + int peak_bitrate; ///< Peak bitrate for VBR, actual bitrate (==peak) for CBR - int num_substreams; ///< Number of substreams within stream + int num_substreams; ///< Number of substreams within stream } MLPHeaderInfo; diff --git a/libavcodec/vp3dsp.c b/libavcodec/vp3dsp.c index 6db80c8d00..df39007649 100644 --- a/libavcodec/vp3dsp.c +++ b/libavcodec/vp3dsp.c @@ -282,11 +282,11 @@ static void put_no_rnd_pixels_l2(uint8_t *dst, const uint8_t *src1, for (i = 0; i < h; i++) { uint32_t a, b; - a = AV_RN32A(&src1[i * stride]); - b = AV_RN32A(&src2[i * stride]); + a = AV_RN32(&src1[i * stride]); + b = AV_RN32(&src2[i * stride]); AV_WN32A(&dst[i * stride], no_rnd_avg32(a, b)); - a = AV_RN32A(&src1[i * stride + 4]); - b = AV_RN32A(&src2[i * stride + 4]); + a = AV_RN32(&src1[i * stride + 4]); + b = AV_RN32(&src2[i * stride + 4]); AV_WN32A(&dst[i * stride + 4], no_rnd_avg32(a, b)); } } |