diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-30 00:38:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-30 00:38:13 +0200 |
| commit | 37ce3188decae50a14c1d430c49ecc369d5876a6 (patch) | |
| tree | a5b4eed88d1b50260a36e417e94c991184a8bfc6 | |
| parent | b3d48c315dece7bc599012075cc92e9a80cdd6ec (diff) | |
| parent | 9d76dd952ffd9fffc7f9fb5cc5af6d093ba54521 (diff) | |
| download | ffmpeg-37ce3188decae50a14c1d430c49ecc369d5876a6.tar.gz | |
Merge commit '9d76dd952ffd9fffc7f9fb5cc5af6d093ba54521'
* commit '9d76dd952ffd9fffc7f9fb5cc5af6d093ba54521':
h264: drop commented out cruft
Conflicts:
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264_slice.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index da2d911ebc..65e8c73b52 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -779,9 +779,6 @@ static int h264_frame_start(H264Context *h) h->block_offset[48 + 32 + i] = (4 * ((scan8[i] - scan8[0]) & 7) << pixel_shift) + 8 * h->uvlinesize * ((scan8[i] - scan8[0]) >> 3); } - // s->decode = (h->flags & CODEC_FLAG_PSNR) || !s->encoding || - // h->cur_pic.reference /* || h->contains_intra */ || 1; - /* We mark the current picture as non-reference after allocating it, so * that if we break out due to an error it can be released automatically * in the next ff_MPV_frame_start(). |