Mercurial > mplayer.hg

comparison libmpcodecs/vf_zrmjpeg.c @ 25962:afa125da85cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
typo fix: inited --> initialized
author diego
date Thu, 14 Feb 2008 14:23:55 +0000
parents 288d00a5c11e
children e353b6f0dad5
comparison
equal deleted inserted replaced
25961:354ad909efcf 25962:afa125da85cf
37 37
38 #undef malloc 38 #undef malloc
39 #undef free 39 #undef free
40 #undef realloc 40 #undef realloc
41 41
42 extern int avcodec_inited; 42 extern int avcodec_initialized;
43 43
44 /* some convenient #define's, is this portable enough? */ 44 /* some convenient #define's, is this portable enough? */
45 /// Printout with vf_zrmjpeg: prefix at VERBOSE level 45 /// Printout with vf_zrmjpeg: prefix at VERBOSE level
46 #define VERBOSE(...) mp_msg(MSGT_DECVIDEO, MSGL_V, "vf_zrmjpeg: " __VA_ARGS__) 46 #define VERBOSE(...) mp_msg(MSGT_DECVIDEO, MSGL_V, "vf_zrmjpeg: " __VA_ARGS__)
47 /// Printout with vf_zrmjpeg: prefix at ERROR level 47 /// Printout with vf_zrmjpeg: prefix at ERROR level
50 #define WARNING(...) mp_msg(MSGT_DECVIDEO, MSGL_WARN, \ 50 #define WARNING(...) mp_msg(MSGT_DECVIDEO, MSGL_WARN, \
51 "vf_zrmjpeg: " __VA_ARGS__) 51 "vf_zrmjpeg: " __VA_ARGS__)
52 52
53 // "local" flag in vd_ffmpeg.c. If not set, avcodec_init() et. al. need to be called 53 // "local" flag in vd_ffmpeg.c. If not set, avcodec_init() et. al. need to be called
54 // set when init is done, so that initialization is not done twice. 54 // set when init is done, so that initialization is not done twice.
55 extern int avcodec_inited; 55 extern int avcodec_initialized;
56 56
57 /// structure copied from mjpeg.c 57 /// structure copied from mjpeg.c
58 /* zrmjpeg_encode_mb needs access to these tables for the black & white 58 /* zrmjpeg_encode_mb needs access to these tables for the black & white
59 * option */ 59 * option */
60 typedef struct MJpegContext { 60 typedef struct MJpegContext {
477 477
478 // Is this needed? 478 // Is this needed?
479 /* if libavcodec is used by the decoder then we must not 479 /* if libavcodec is used by the decoder then we must not
480 * initialize again, but if it is not initialized then we must 480 * initialize again, but if it is not initialized then we must
481 * initialize it here. */ 481 * initialize it here. */
482 if (!avcodec_inited) { 482 if (!avcodec_initialized) {
483 avcodec_init(); 483 avcodec_init();
484 avcodec_register_all(); 484 avcodec_register_all();
485 avcodec_inited=1; 485 avcodec_initialized=1;
486 } 486 }
487 487
488 // Build mjpeg huffman code tables, setting up j->s->mjpeg_ctx 488 // Build mjpeg huffman code tables, setting up j->s->mjpeg_ctx
489 if (ff_mjpeg_encode_init(j->s) < 0) { 489 if (ff_mjpeg_encode_init(j->s) < 0) {
490 av_free(j->s); 490 av_free(j->s);
919 priv->hdec = 1; 919 priv->hdec = 1;
920 priv->vdec = 1; 920 priv->vdec = 1;
921 921
922 /* if libavcodec is already initialized, we must not initialize it 922 /* if libavcodec is already initialized, we must not initialize it
923 * again, but if it is not initialized then we mustinitialize it now. */ 923 * again, but if it is not initialized then we mustinitialize it now. */
924 if (!avcodec_inited) { 924 if (!avcodec_initialized) {
925 /* we need to initialize libavcodec */ 925 /* we need to initialize libavcodec */
926 avcodec_init(); 926 avcodec_init();
927 avcodec_register_all(); 927 avcodec_register_all();
928 avcodec_inited=1; 928 avcodec_initialized=1;
929 } 929 }
930 930
931 if (args) { 931 if (args) {
932 char *arg, *tmp, *ptr, junk; 932 char *arg, *tmp, *ptr, junk;
933 int last = 0, input; 933 int last = 0, input;