cleanup
Originally committed as revision 2537 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
		@@ -1616,7 +1616,7 @@ int ff_get_best_fcode(MpegEncContext * s, int16_t (*mv_table)[2], int type)
 | 
			
		||||
            int x;
 | 
			
		||||
            int xy= y*s->mb_stride;
 | 
			
		||||
            for(x=0; x<s->mb_width; x++){
 | 
			
		||||
                if((s->mb_type[xy] & type) || (s->mb_type[xy] & MB_TYPE_INTRA)){ //FIXME 
 | 
			
		||||
                if(s->mb_type[xy] & type){
 | 
			
		||||
                    int fcode= FFMAX(fcode_tab[mv_table[xy][0] + MAX_MV],
 | 
			
		||||
                                     fcode_tab[mv_table[xy][1] + MAX_MV]);
 | 
			
		||||
                    int j;
 | 
			
		||||
 
 | 
			
		||||
@@ -29,14 +29,14 @@ stddev:  8.02 bytes:7602176
 | 
			
		||||
5704a082cc5c5970620123ae20566286 *./data/a-huffyuv.avi
 | 
			
		||||
799d3db687f6cdd7a837ec156efc171f *./data/out.yuv
 | 
			
		||||
stddev:  0.00 bytes:7602176
 | 
			
		||||
0cb2324e62eba4bb94d1cd2946355137 *./data/a-mpeg4-rc.avi
 | 
			
		||||
94f5f1d46c5da6d929eb8633835e73cb *./data/out.yuv
 | 
			
		||||
e9f63126859b97cd23cd1413038f8f7b *./data/a-mpeg4-rc.avi
 | 
			
		||||
90a159074b1b109569914ee63f387860 *./data/out.yuv
 | 
			
		||||
stddev: 10.18 bytes:7145472
 | 
			
		||||
dfe8fcd409a0605ef0cb37fc5e76ecf7 *./data/a-mpeg4-adv.avi
 | 
			
		||||
c8877a6b8ed290a637c2119860b468b0 *./data/out.yuv
 | 
			
		||||
stddev:  7.31 bytes:7602176
 | 
			
		||||
843225ac495abfcc480296143c26bde3 *./data/a-mpeg1b.mpg
 | 
			
		||||
da8e21c7b78b7a25558dc319524b91d8 *./data/out.yuv
 | 
			
		||||
cf79878f8851b5c865711842965a6c4a *./data/a-mpeg1b.mpg
 | 
			
		||||
41b3baa7d8c17202e6577947ac37cad0 *./data/out.yuv
 | 
			
		||||
stddev:  6.32 bytes:6842368
 | 
			
		||||
07042f42b3119c39eb26537a84a451df *./data/a-mjpeg.avi
 | 
			
		||||
f23a9e50a559e174766ee808c48fea22 *./data/out.yuv
 | 
			
		||||
 
 | 
			
		||||
@@ -200,7 +200,7 @@ fi
 | 
			
		||||
if [ -n "$do_mpeg4" ] ; then
 | 
			
		||||
# mpeg4
 | 
			
		||||
file=${outfile}odivx.mp4
 | 
			
		||||
do_ffmpeg $file -y -4mv -qscale 10 -f pgmyuv -i $raw_src -an -vcodec mpeg4 $file
 | 
			
		||||
do_ffmpeg $file -y -4mv -hq -qscale 10 -f pgmyuv -i $raw_src -an -vcodec mpeg4 $file
 | 
			
		||||
 | 
			
		||||
# mpeg4 decoding
 | 
			
		||||
do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst 
 | 
			
		||||
 
 | 
			
		||||
@@ -29,8 +29,8 @@ stddev:  5.28 bytes:7602176
 | 
			
		||||
242a7a18c2793e115007bc163861ef4e *./data/a-huffyuv.avi
 | 
			
		||||
dde5895817ad9d219f79a52d0bdfb001 *./data/out.yuv
 | 
			
		||||
stddev:  0.00 bytes:7602176
 | 
			
		||||
f149deded058e0ebb778001922d869ac *./data/a-mpeg4-rc.avi
 | 
			
		||||
6f36eb7cbe1e5e91229f7356c2c88c0a *./data/out.yuv
 | 
			
		||||
6a469f42ce6946dd4c708f9e51e3da6a *./data/a-mpeg4-rc.avi
 | 
			
		||||
df9de7134d961119705b4e0cabca1f12 *./data/out.yuv
 | 
			
		||||
stddev:  4.20 bytes:7145472
 | 
			
		||||
bb11d9808375911ea63d4f0889306037 *./data/a-mpeg4-adv.avi
 | 
			
		||||
e465df12f2c8a6492a6ec0b1bddc1d0d *./data/out.yuv
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user