Mercurial > mplayer.hg

comparison libmpcodecs/vd_ffmpeg.c @ 5940:dd7b88bb76aa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
10l
author alex
date Thu, 02 May 2002 16:09:54 +0000
parents 65ee86f5a45f
children f49ec39ab0c6
comparison
equal deleted inserted replaced
5939:65ee86f5a45f 5940:dd7b88bb76aa
102 avctx->sub_id = 3; 102 avctx->sub_id = 3;
103 #if LIBAVCODEC_BUILD >= 4605 103 #if LIBAVCODEC_BUILD >= 4605
104 /* AVRn stores huffman table in AVI header */ 104 /* AVRn stores huffman table in AVI header */
105 /* Pegasus MJPEG stores it also in AVI header, but it uses the common 105 /* Pegasus MJPEG stores it also in AVI header, but it uses the common
106 MJPG fourcc :( */ 106 MJPG fourcc :( */
107 if ((sh->bih->biSize != sizeof(BITMAPINFOHEADER)) && 107 if (sh->bih && (sh->bih->biSize != sizeof(BITMAPINFOHEADER)) &&
108 (sh->format == mmioFOURCC('A','V','R','n') || 108 (sh->format == mmioFOURCC('A','V','R','n') ||
109 sh->format == mmioFOURCC('M','J','P','G'))) 109 sh->format == mmioFOURCC('M','J','P','G')))
110 { 110 {
111 avctx->flags |= CODEC_FLAG_EXTERN_HUFF; 111 avctx->flags |= CODEC_FLAG_EXTERN_HUFF;
112 avctx->extradata_size = sh->bih->biSize-sizeof(BITMAPINFOHEADER); 112 avctx->extradata_size = sh->bih->biSize-sizeof(BITMAPINFOHEADER);