[FFmpeg-cvslog] mpeg4videoenc: Kill non-compiling disabled cruft
Diego Biurrun
git at videolan.org
Sun Mar 19 16:30:21 EET 2017
ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Tue Aug 2 12:00:03 2016 +0200| [d5fda00efa756387cffb4d7294691cd54cfe86cf] | committer: Diego Biurrun
mpeg4videoenc: Kill non-compiling disabled cruft
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d5fda00efa756387cffb4d7294691cd54cfe86cf
---
libavcodec/mpeg4videoenc.c | 28 ----------------------------
1 file changed, 28 deletions(-)
diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c
index b694935..8815ba8 100644
--- a/libavcodec/mpeg4videoenc.c
+++ b/libavcodec/mpeg4videoenc.c
@@ -256,7 +256,6 @@ void ff_clean_mpeg4_qscales(MpegEncContext *s)
*/
static inline void mpeg4_encode_dc(PutBitContext *s, int level, int n)
{
-#if 1
/* DC will overflow if level is outside the [-255,255] range. */
level += 256;
if (n < 4) {
@@ -266,33 +265,6 @@ static inline void mpeg4_encode_dc(PutBitContext *s, int level, int n)
/* chrominance */
put_bits(s, uni_DCtab_chrom_len[level], uni_DCtab_chrom_bits[level]);
}
-#else
- int size, v;
- /* find number of bits */
- size = 0;
- v = abs(level);
- while (v) {
- v >>= 1;
- size++;
- }
-
- if (n < 4) {
- /* luminance */
- put_bits(&s->pb, ff_mpeg4_DCtab_lum[size][1], ff_mpeg4_DCtab_lum[size][0]);
- } else {
- /* chrominance */
- put_bits(&s->pb, ff_mpeg4_DCtab_chrom[size][1], ff_mpeg4_DCtab_chrom[size][0]);
- }
-
- /* encode remaining bits */
- if (size > 0) {
- if (level < 0)
- level = (-level) ^ ((1 << size) - 1);
- put_bits(&s->pb, size, level);
- if (size > 8)
- put_bits(&s->pb, 1, 1);
- }
-#endif
}
static inline int mpeg4_get_dc_length(int level, int n)
More information about the ffmpeg-cvslog
mailing list