From 40cf1add12fa24834ed6925fd5b68af1322b1aca Mon Sep 17 00:00:00 2001 From: Tim Walker Date: Mon, 31 Dec 2012 15:33:28 +0100 Subject: [PATCH 1/2] mlp_parser: cosmetics: re-indent. Signed-off-by: Justin Ruggles --- libavcodec/mlp_parser.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libavcodec/mlp_parser.h b/libavcodec/mlp_parser.h index 24b4169419..e8744266e3 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; From 0ee8293a77a6afad161e91ce1d43c4a57ce33a6a Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Tue, 22 Jan 2013 12:45:35 -0800 Subject: [PATCH 2/2] vp3dsp: don't do aligned reads on input. The input is not guaranteed to be aligned. --- libavcodec/vp3dsp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/vp3dsp.c b/libavcodec/vp3dsp.c index 1883099002..0ce6b81d98 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)); } }