diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-08 05:03:14 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-08 05:03:14 +0400 |
| commit | 0bd42ae72c0e88826b823d8106286d5abe2028e7 (patch) | |
| tree | da7087d1f67ea54580026e30dcedb4f58db6aba6 /libavcodec/msmpeg4.c | |
| parent | 5955c63c36e9b822f1186cd45a8dec5056b9c575 (diff) | |
| parent | 1c8c41ff079953d332f61a9d26656e4e36af606c (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avformat: Avoid a warning about mixed declarations and code
BMV demuxer and decoder
matroskaenc: Make sure the seekhead struct is freed even on seek failure
mpeg12enc: Remove write-only variables.
mpeg12enc: Don't set up run-level info for level 0.
msmpeg4: Don't set up run-level info for level 0.
avformat: Warn about using network functions without calling avformat_network_init
avformat: Revise wording
rdt: Set AVFMT_NOFILE on ff_rdt_demuxer
rdt: Check the return value of avformat_open
rtsp: Discard the dynamic handler, if it has an alloc function which failed
dsputil: use cpuflags in x86 versions of vector_clip_int32()
Conflicts:
libavcodec/avcodec.h
libavcodec/version.h
libavformat/Makefile
libavformat/allformats.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/msmpeg4.c')
| -rw-r--r-- | libavcodec/msmpeg4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c index 8997f6d054..b364845c25 100644 --- a/libavcodec/msmpeg4.c +++ b/libavcodec/msmpeg4.c @@ -266,7 +266,7 @@ av_cold void ff_msmpeg4_encode_init(MpegEncContext *s) for(i=0; i<NB_RL_TABLES; i++){ int level; - for(level=0; level<=MAX_LEVEL; level++){ + for (level = 1; level <= MAX_LEVEL; level++) { int run; for(run=0; run<=MAX_RUN; run++){ int last; |