diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-22 03:48:38 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-22 04:51:53 +0400 |
| commit | 52c522c72090233edeeb0486a9bd8bee925a710a (patch) | |
| tree | 23f091bb1fb649e8358d01516670360c13cb08e6 /libavutil/aes.c | |
| parent | a40f43db647bfacafbd1e27a4cd5f6134c6e6c53 (diff) | |
| parent | e9dc92012773aab5f51d8d37eb14564988c5f217 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (27 commits)
asfdec: add side data to ASFStream packet instead of output packet.
idroqdec: set AVFMTCTX_NOHEADER and create streams as they occur.
nellymoserdec: Indicate that the decoder can handle changed parameters
libavcodec: Apply parameter change side data when decoding audio
flvdec: Add param change side data if the sample rate or channels have changed
libavformat: Add a utility function for adding parameter change side data
libavcodec: Define a side data type for parameter changes
aacdec: Handle new extradata passed as side data
flvdec: Export new AAC/H.264 extradata as side data on the next packet
libavcodec: Define a side data type for new extradata
flacdec: skip all track indices at once instead of looping.
mxf: Add PictureEssenceCoding UL for V210.
mxfdec: consider QuantizationBits between 17 and 24 to be pcm_s24*
mxfenc: Add support for MPEG-2 MP@HL-14 in mxf container.
mxf: H.264/MPEG-4 AVC Intra support
configure: Show whether the safe bitstream reader is enabled
x86: Tighten register constraints for decode_significance*_x86.
Replace Subversion revisions in comments by Git hashes.
h264_cabac: synchronize decode_significance_*_x86 conditionals
w32threads: wait for the waked thread in pthread_cond_signal.
...
Conflicts:
libavcodec/avcodec.h
libavcodec/version.h
libavformat/flvdec.c
libavformat/utils.c
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/aes.c')
| -rw-r--r-- | libavutil/aes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/aes.c b/libavutil/aes.c index 46b290ccc4..7950902280 100644 --- a/libavutil/aes.c +++ b/libavutil/aes.c @@ -33,7 +33,7 @@ typedef union { typedef struct AVAES { // Note: round_key[16] is accessed in the init code, but this only - // overwrites state, which does not matter (see also r7471). + // overwrites state, which does not matter (see also commit ba554c0). av_aes_block round_key[15]; av_aes_block state[2]; int rounds; |