Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(73)

Side by Side Diff: patched-ffmpeg-mt/libavcodec/msmpeg4.c

Issue 789004: ffmpeg roll of source to mar 9 version... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: '' Created 10 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * MSMPEG4 backend for ffmpeg encoder and decoder 2 * MSMPEG4 backend for ffmpeg encoder and decoder
3 * Copyright (c) 2001 Fabrice Bellard 3 * Copyright (c) 2001 Fabrice Bellard
4 * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> 4 * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
5 * 5 *
6 * msmpeg4v1 & v2 stuff by Michael Niedermayer <michaelni@gmx.at> 6 * msmpeg4v1 & v2 stuff by Michael Niedermayer <michaelni@gmx.at>
7 * 7 *
8 * This file is part of FFmpeg. 8 * This file is part of FFmpeg.
9 * 9 *
10 * FFmpeg is free software; you can redistribute it and/or 10 * FFmpeg is free software; you can redistribute it and/or
(...skipping 1714 matching lines...) Expand 10 before | Expand all | Expand 10 after
1725 SKIP_COUNTER(re, &s->gb, 1+6+8); 1725 SKIP_COUNTER(re, &s->gb, 1+6+8);
1726 }else{ 1726 }else{
1727 int sign; 1727 int sign;
1728 last= SHOW_UBITS(re, &s->gb, 1); SKIP_BITS(re, &s->gb, 1); 1728 last= SHOW_UBITS(re, &s->gb, 1); SKIP_BITS(re, &s->gb, 1);
1729 if(!s->esc3_level_length){ 1729 if(!s->esc3_level_length){
1730 int ll; 1730 int ll;
1731 //printf("ESC-3 %X at %d %d\n", show_bits(&s->gb, 24 ), s->mb_x, s->mb_y); 1731 //printf("ESC-3 %X at %d %d\n", show_bits(&s->gb, 24 ), s->mb_x, s->mb_y);
1732 if(s->qscale<8){ 1732 if(s->qscale<8){
1733 ll= SHOW_UBITS(re, &s->gb, 3); SKIP_BITS(re, &s- >gb, 3); 1733 ll= SHOW_UBITS(re, &s->gb, 3); SKIP_BITS(re, &s- >gb, 3);
1734 if(ll==0){ 1734 if(ll==0){
1735 if(SHOW_UBITS(re, &s->gb, 1)) av_log(s->avct x, AV_LOG_ERROR, "cool a new vlc code ,contact the ffmpeg developers and upload the file\n"); 1735 ll= 8+SHOW_UBITS(re, &s->gb, 1); SKIP_BITS(r e, &s->gb, 1);
1736 SKIP_BITS(re, &s->gb, 1);
1737 ll=8;
1738 } 1736 }
1739 }else{ 1737 }else{
1740 ll=2; 1738 ll=2;
1741 while(ll<8 && SHOW_UBITS(re, &s->gb, 1)==0){ 1739 while(ll<8 && SHOW_UBITS(re, &s->gb, 1)==0){
1742 ll++; 1740 ll++;
1743 SKIP_BITS(re, &s->gb, 1); 1741 SKIP_BITS(re, &s->gb, 1);
1744 } 1742 }
1745 if(ll<8) SKIP_BITS(re, &s->gb, 1); 1743 if(ll<8) SKIP_BITS(re, &s->gb, 1);
1746 } 1744 }
1747 1745
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
1969 CODEC_ID_WMV1, 1967 CODEC_ID_WMV1,
1970 sizeof(MpegEncContext), 1968 sizeof(MpegEncContext),
1971 ff_msmpeg4_decode_init, 1969 ff_msmpeg4_decode_init,
1972 NULL, 1970 NULL,
1973 ff_h263_decode_end, 1971 ff_h263_decode_end,
1974 ff_h263_decode_frame, 1972 ff_h263_decode_frame,
1975 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, 1973 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
1976 .long_name= NULL_IF_CONFIG_SMALL("Windows Media Video 7"), 1974 .long_name= NULL_IF_CONFIG_SMALL("Windows Media Video 7"),
1977 .pix_fmts= ff_pixfmt_list_420, 1975 .pix_fmts= ff_pixfmt_list_420,
1978 }; 1976 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698