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

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

Issue 3384002: ffmpeg source update for sep 09 (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: Created 10 years, 3 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 1377 matching lines...) Expand 10 before | Expand all | Expand 10 after
1388 int i; 1388 int i;
1389 for(i=0; i<s->gb.size_in_bits; i++) 1389 for(i=0; i<s->gb.size_in_bits; i++)
1390 av_log(s->avctx, AV_LOG_DEBUG, "%d", get_bits1(&s->gb)); 1390 av_log(s->avctx, AV_LOG_DEBUG, "%d", get_bits1(&s->gb));
1391 // get_bits1(&s->gb); 1391 // get_bits1(&s->gb);
1392 av_log(s->avctx, AV_LOG_DEBUG, "END\n"); 1392 av_log(s->avctx, AV_LOG_DEBUG, "END\n");
1393 return -1; 1393 return -1;
1394 } 1394 }
1395 #endif 1395 #endif
1396 1396
1397 if(s->msmpeg4_version==1){ 1397 if(s->msmpeg4_version==1){
1398 int start_code; 1398 int start_code = get_bits_long(&s->gb, 32);
1399 start_code = (get_bits(&s->gb, 16)<<16) | get_bits(&s->gb, 16);
1400 if(start_code!=0x00000100){ 1399 if(start_code!=0x00000100){
1401 av_log(s->avctx, AV_LOG_ERROR, "invalid startcode\n"); 1400 av_log(s->avctx, AV_LOG_ERROR, "invalid startcode\n");
1402 return -1; 1401 return -1;
1403 } 1402 }
1404 1403
1405 skip_bits(&s->gb, 5); // frame number */ 1404 skip_bits(&s->gb, 5); // frame number */
1406 } 1405 }
1407 1406
1408 s->pict_type = get_bits(&s->gb, 2) + 1; 1407 s->pict_type = get_bits(&s->gb, 2) + 1;
1409 if (s->pict_type != FF_I_TYPE && 1408 if (s->pict_type != FF_I_TYPE &&
(...skipping 561 matching lines...) Expand 10 before | Expand all | Expand 10 after
1971 sizeof(MpegEncContext), 1970 sizeof(MpegEncContext),
1972 ff_msmpeg4_decode_init, 1971 ff_msmpeg4_decode_init,
1973 NULL, 1972 NULL,
1974 ff_h263_decode_end, 1973 ff_h263_decode_end,
1975 ff_h263_decode_frame, 1974 ff_h263_decode_frame,
1976 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, 1975 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
1977 .max_lowres= 3, 1976 .max_lowres= 3,
1978 .long_name= NULL_IF_CONFIG_SMALL("Windows Media Video 7"), 1977 .long_name= NULL_IF_CONFIG_SMALL("Windows Media Video 7"),
1979 .pix_fmts= ff_pixfmt_list_420, 1978 .pix_fmts= ff_pixfmt_list_420,
1980 }; 1979 };
OLDNEW
« no previous file with comments | « source/patched-ffmpeg-mt/libavcodec/mpegvideo_enc.c ('k') | source/patched-ffmpeg-mt/libavcodec/nuv.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698