diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-24 14:55:14 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-24 14:55:14 +0200 |
commit | 0ebc3728561cc7a875c33bf1a5590d31eb53d9ac (patch) | |
tree | 07c1f0ef6d662e021a23f217b000b01e980b6328 /libavcodec/rangecoder.c | |
parent | ab0b1fdd176c76d0d95adc7ceb85a1d8e585d667 (diff) | |
parent | 5f24fe82e5fcf227abb5ebf62aa9bc246fda8c0d (diff) | |
download | ffmpeg-0ebc3728561cc7a875c33bf1a5590d31eb53d9ac.tar.gz |
Merge commit '5f24fe82e5fcf227abb5ebf62aa9bc246fda8c0d'
* commit '5f24fe82e5fcf227abb5ebf62aa9bc246fda8c0d':
mpegvideo: Initialize chroma_*_shift and codec_tag even if the size is 0
Conflicts:
libavcodec/mpegvideo.c
The chroma_*_shift and codec_tag code was not under a size!=0 check in ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rangecoder.c')
0 files changed, 0 insertions, 0 deletions