← Back to branch summary

~medibuntu-maintainers/mplayer/medibuntu.precise

« back to all changes in this revision

Viewing changes to ffmpeg/libavcodec/mpeg4video.h

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2012-01-12 22:23:28 UTC
  • mfrom: (0.4.7 sid)
  • mto: This revision was merged to the branch mainline in revision 76.
  • Revision ID: package-import@ubuntu.com-20120112222328-8jqdyodym3p84ygu
Tags: 2:1.0~rc4.dfsg1+svn34540-1
* New upstream snapshot
* upload to unstable

Show diffs side-by-side

added added

removed removed

Lines of Context:
ffmpeg/libavcodec/mpeg4video.h
119
119
 
120
120
 
121
121
/**
122
 
 * predicts the dc.
 
122
 * Predict the dc.
123
123
 * encoding quantized level -> quantized diff
124
124
 * decoding quantized diff -> quantized level
125
125
 * @param n block index (0-3 are luma, 4-5 are chroma)
174
174
    }else{
175
175
        level += pred;
176
176
        ret= level;
177
 
        if(s->error_recognition>=3){
 
177
        if(s->err_recognition&AV_EF_BITSTREAM){
178
178
            if(level<0){
179
179
                av_log(s->avctx, AV_LOG_ERROR, "dc<0 at %dx%d\n", s->mb_x, s->mb_y);
180
180
                return -1;