RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Niedermayer 2013-01-23 16:52:05 +01:00
parent 0ff21c3165 0ee8293a77
commit 516f30ed20
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/mlp_parser.h
View File

@ -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;

8
libavcodec/vp3dsp.c
View File

@ -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));
}
}