January 2007 - ffmpeg-cvslog - lists.ffmpeg.org

r7775 - trunk/libavcodec/lzo.c
by subversion＠mplayerhq.hu 31 Jan '07

31 Jan '07

Author: reimar Date: Wed Jan 31 10:37:02 2007 New Revision: 7775 Modified: trunk/libavcodec/lzo.c Log: Add code to testcode to ease comparing with liblzo. Modified: trunk/libavcodec/lzo.c ============================================================================== --- trunk/libavcodec/lzo.c (original) +++ trunk/libavcodec/lzo.c Wed Jan 31 10:37:02 2007 @@ -255,7 +255,13 @@ for (i = 0; i < 300; i++) { START_TIMER inlen = clen; outlen = MAXSZ; +#ifdef LIBLZO + if (lzo1x_decompress_safe(comp, inlen, decomp, &outlen, NULL)) +#elif defined(LIBLZO_UNSAFE) + if (lzo1x_decompress(comp, inlen, decomp, &outlen, NULL)) +#else if (lzo1x_decode(decomp, &outlen, comp, &inlen)) +#endif av_log(NULL, AV_LOG_ERROR, "decompression error\n"); STOP_TIMER("lzod") }

1 0

r7774 - trunk/libavformat/mpegts.c
by subversion＠mplayerhq.hu 31 Jan '07

31 Jan '07

Author: diego Date: Wed Jan 31 09:29:24 2007 New Revision: 7774 Modified: trunk/libavformat/mpegts.c Log: Add some context to av_log calls. patch by Michel Bardiaux, mbardiaux mediaxim be Modified: trunk/libavformat/mpegts.c ============================================================================== --- trunk/libavformat/mpegts.c (original) +++ trunk/libavformat/mpegts.c Wed Jan 31 09:29:24 2007 @@ -177,7 +177,7 @@ MpegTSSectionFilter *sec; #ifdef DEBUG_SI - av_log(NULL, AV_LOG_DEBUG, "Filter: pid=0x%x\n", pid); + av_log(ts->stream, AV_LOG_DEBUG, "Filter: pid=0x%x\n", pid); #endif if (pid >= NB_PID_MAX || ts->pids[pid]) return NULL; @@ -372,7 +372,7 @@ MpegTSService *service; #ifdef DEBUG_SI - av_log(NULL, AV_LOG_DEBUG, "new_service: " + av_log(ts->stream, AV_LOG_DEBUG, "new_service: " "sid=0x%04x provider='%s' name='%s'\n", sid, provider_name, name); #endif @@ -400,7 +400,7 @@ char language[4]; #ifdef DEBUG_SI - av_log(NULL, AV_LOG_DEBUG, "PMT: len %i\n", section_len); + av_log(ts->stream, AV_LOG_DEBUG, "PMT: len %i\n", section_len); av_hex_dump(stdout, (uint8_t *)section, section_len); #endif p_end = section + section_len - 4; @@ -408,7 +408,7 @@ if (parse_section_header(h, &p, p_end) < 0) return; #ifdef DEBUG_SI - av_log(NULL, AV_LOG_DEBUG, "sid=0x%x sec_num=%d/%d\n", + av_log(ts->stream, AV_LOG_DEBUG, "sid=0x%x sec_num=%d/%d\n", h->id, h->sec_num, h->last_sec_num); #endif if (h->tid != PMT_TID || (ts->req_sid >= 0 && h->id != ts->req_sid) ) @@ -419,7 +419,7 @@ return; ts->pcr_pid = pcr_pid; #ifdef DEBUG_SI - av_log(NULL, AV_LOG_DEBUG, "pcr_pid=0x%x\n", pcr_pid); + av_log(ts->stream, AV_LOG_DEBUG, "pcr_pid=0x%x\n", pcr_pid); #endif program_info_length = get16(&p, p_end) & 0xfff; if (program_info_length < 0) @@ -460,7 +460,7 @@ if (desc_end > desc_list_end) break; #ifdef DEBUG_SI - av_log(NULL, AV_LOG_DEBUG, "tag: 0x%02x len=%d\n", + av_log(ts->stream, AV_LOG_DEBUG, "tag: 0x%02x len=%d\n", desc_tag, desc_len); #endif switch(desc_tag) { @@ -491,7 +491,7 @@ p = desc_list_end; #ifdef DEBUG_SI - av_log(NULL, AV_LOG_DEBUG, "stream_type=%d pid=0x%x\n", + av_log(ts->stream, AV_LOG_DEBUG, "stream_type=%d pid=0x%x\n", stream_type, pid); #endif @@ -543,7 +543,7 @@ int sid, pmt_pid; #ifdef DEBUG_SI - av_log(NULL, AV_LOG_DEBUG, "PAT:\n"); + av_log(ts->stream, AV_LOG_DEBUG, "PAT:\n"); av_hex_dump(stdout, (uint8_t *)section, section_len); #endif p_end = section + section_len - 4; @@ -561,7 +561,7 @@ if (pmt_pid < 0) break; #ifdef DEBUG_SI - av_log(NULL, AV_LOG_DEBUG, "sid=0x%x pid=0x%x\n", sid, pmt_pid); + av_log(ts->stream, AV_LOG_DEBUG, "sid=0x%x pid=0x%x\n", sid, pmt_pid); #endif if (sid == 0x0000) { /* NIT info */ @@ -592,7 +592,7 @@ char buf[256]; #ifdef DEBUG_SI - av_log(NULL, AV_LOG_DEBUG, "PAT:\n"); + av_log(ts->stream, AV_LOG_DEBUG, "PAT:\n"); av_hex_dump(stdout, (uint8_t *)section, section_len); #endif p_end = section + section_len - 4; @@ -610,7 +610,7 @@ if (pmt_pid < 0) break; #ifdef DEBUG_SI - av_log(NULL, AV_LOG_DEBUG, "sid=0x%x pid=0x%x\n", sid, pmt_pid); + av_log(ts->stream, AV_LOG_DEBUG, "sid=0x%x pid=0x%x\n", sid, pmt_pid); #endif if (sid == 0x0000) { /* NIT info */ @@ -653,7 +653,7 @@ char *name, *provider_name; #ifdef DEBUG_SI - av_log(NULL, AV_LOG_DEBUG, "SDT:\n"); + av_log(ts->stream, AV_LOG_DEBUG, "SDT:\n"); av_hex_dump(stdout, (uint8_t *)section, section_len); #endif @@ -691,7 +691,7 @@ if (desc_end > desc_list_end) break; #ifdef DEBUG_SI - av_log(NULL, AV_LOG_DEBUG, "tag: 0x%02x len=%d\n", + av_log(ts->stream, AV_LOG_DEBUG, "tag: 0x%02x len=%d\n", desc_tag, desc_len); #endif switch(desc_tag) { @@ -1254,7 +1254,7 @@ service = ts->services[i]; sid = service->sid; #ifdef DEBUG_SI - av_log(NULL, AV_LOG_DEBUG, "tuning to '%s'\n", service->name); + av_log(ts->stream, AV_LOG_DEBUG, "tuning to '%s'\n", service->name); #endif /* now find the info for the first service if we found any, @@ -1278,7 +1278,7 @@ } #ifdef DEBUG_SI - av_log(NULL, AV_LOG_DEBUG, "tuning done\n"); + av_log(ts->stream, AV_LOG_DEBUG, "tuning done\n"); #endif } s->ctx_flags |= AVFMTCTX_NOHEADER; @@ -1329,7 +1329,7 @@ st->codec->bit_rate = s->bit_rate; st->start_time = ts->cur_pcr; #if 0 - av_log(NULL, AV_LOG_DEBUG, "start=%0.3f pcr=%0.3f incr=%d\n", + av_log(ts->stream, AV_LOG_DEBUG, "start=%0.3f pcr=%0.3f incr=%d\n", st->start_time / 1000000.0, pcrs[0] / 27e6, ts->pcr_incr); #endif }

1 0

r7674 - trunk/libavformat/mpegts.c
by subversion＠mplayerhq.hu 31 Jan '07

31 Jan '07

Author: michael Date: Tue Jan 23 22:41:30 2007 New Revision: 7674 Modified: trunk/libavformat/mpegts.c Log: "converts printf's to avlog's" patch by Daniel Kristjansson / danielk mrl.nyu edu another 1 year old patch forgoten by mans trailing whitespace removial by me Modified: trunk/libavformat/mpegts.c ============================================================================== --- trunk/libavformat/mpegts.c (original) +++ trunk/libavformat/mpegts.c Tue Jan 23 22:41:30 2007 @@ -162,7 +162,7 @@ MpegTSSectionFilter *sec; #ifdef DEBUG_SI - printf("Filter: pid=0x%x\n", pid); + av_log(NULL, AV_LOG_DEBUG, "Filter: pid=0x%x\n", pid); #endif if (pid >= NB_PID_MAX || ts->pids[pid]) return NULL; @@ -357,7 +357,8 @@ MpegTSService *service; #ifdef DEBUG_SI - printf("new_service: sid=0x%04x provider='%s' name='%s'\n", + av_log(NULL, AV_LOG_DEBUG, "new_service: " + "sid=0x%04x provider='%s' name='%s'\n", sid, provider_name, name); #endif @@ -384,7 +385,7 @@ char language[4]; #ifdef DEBUG_SI - printf("PMT:\n"); + av_log(NULL, AV_LOG_DEBUG, "PMT: len %i\n", section_len); av_hex_dump(stdout, (uint8_t *)section, section_len); #endif p_end = section + section_len - 4; @@ -392,7 +393,8 @@ if (parse_section_header(h, &p, p_end) < 0) return; #ifdef DEBUG_SI - printf("sid=0x%x sec_num=%d/%d\n", h->id, h->sec_num, h->last_sec_num); + av_log(NULL, AV_LOG_DEBUG, "sid=0x%x sec_num=%d/%d\n", + h->id, h->sec_num, h->last_sec_num); #endif if (h->tid != PMT_TID || (ts->req_sid >= 0 && h->id != ts->req_sid) ) return; @@ -402,7 +404,7 @@ return; ts->pcr_pid = pcr_pid; #ifdef DEBUG_SI - printf("pcr_pid=0x%x\n", pcr_pid); + av_log(NULL, AV_LOG_DEBUG, "pcr_pid=0x%x\n", pcr_pid); #endif program_info_length = get16(&p, p_end) & 0xfff; if (program_info_length < 0) @@ -443,7 +445,8 @@ if (desc_end > desc_list_end) break; #ifdef DEBUG_SI - printf("tag: 0x%02x len=%d\n", desc_tag, desc_len); + av_log(NULL, AV_LOG_DEBUG, "tag: 0x%02x len=%d\n", + desc_tag, desc_len); #endif switch(desc_tag) { case DVB_SUBT_DESCID: @@ -473,7 +476,8 @@ p = desc_list_end; #ifdef DEBUG_SI - printf("stream_type=%d pid=0x%x\n", stream_type, pid); + av_log(NULL, AV_LOG_DEBUG, "stream_type=%d pid=0x%x\n", + stream_type, pid); #endif /* now create ffmpeg stream */ @@ -524,7 +528,7 @@ int sid, pmt_pid; #ifdef DEBUG_SI - printf("PAT:\n"); + av_log(NULL, AV_LOG_DEBUG, "PAT:\n"); av_hex_dump(stdout, (uint8_t *)section, section_len); #endif p_end = section + section_len - 4; @@ -542,7 +546,7 @@ if (pmt_pid < 0) break; #ifdef DEBUG_SI - printf("sid=0x%x pid=0x%x\n", sid, pmt_pid); + av_log(NULL, AV_LOG_DEBUG, "sid=0x%x pid=0x%x\n", sid, pmt_pid); #endif if (sid == 0x0000) { /* NIT info */ @@ -573,7 +577,7 @@ char buf[256]; #ifdef DEBUG_SI - printf("PAT:\n"); + av_log(NULL, AV_LOG_DEBUG, "PAT:\n"); av_hex_dump(stdout, (uint8_t *)section, section_len); #endif p_end = section + section_len - 4; @@ -591,7 +595,7 @@ if (pmt_pid < 0) break; #ifdef DEBUG_SI - printf("sid=0x%x pid=0x%x\n", sid, pmt_pid); + av_log(NULL, AV_LOG_DEBUG, "sid=0x%x pid=0x%x\n", sid, pmt_pid); #endif if (sid == 0x0000) { /* NIT info */ @@ -634,7 +638,7 @@ char *name, *provider_name; #ifdef DEBUG_SI - printf("SDT:\n"); + av_log(NULL, AV_LOG_DEBUG, "SDT:\n"); av_hex_dump(stdout, (uint8_t *)section, section_len); #endif @@ -672,7 +676,8 @@ if (desc_end > desc_list_end) break; #ifdef DEBUG_SI - printf("tag: 0x%02x len=%d\n", desc_tag, desc_len); + av_log(NULL, AV_LOG_DEBUG, "tag: 0x%02x len=%d\n", + desc_tag, desc_len); #endif switch(desc_tag) { case 0x48: @@ -1234,7 +1239,7 @@ service = ts->services[i]; sid = service->sid; #ifdef DEBUG_SI - printf("tuning to '%s'\n", service->name); + av_log(NULL, AV_LOG_DEBUG, "tuning to '%s'\n", service->name); #endif /* now find the info for the first service if we found any, @@ -1258,7 +1263,7 @@ } #ifdef DEBUG_SI - printf("tuning done\n"); + av_log(NULL, AV_LOG_DEBUG, "tuning done\n"); #endif } s->ctx_flags |= AVFMTCTX_NOHEADER; @@ -1309,7 +1314,7 @@ st->codec->bit_rate = s->bit_rate; st->start_time = ts->cur_pcr; #if 0 - printf("start=%0.3f pcr=%0.3f incr=%d\n", + av_log(NULL, AV_LOG_DEBUG, "start=%0.3f pcr=%0.3f incr=%d\n", st->start_time / 1000000.0, pcrs[0] / 27e6, ts->pcr_incr); #endif }

4 10

r7773 - trunk/libavcodec/bmp.c
by subversion＠mplayerhq.hu 31 Jan '07

31 Jan '07

Author: takis Date: Wed Jan 31 01:34:56 2007 New Revision: 7773 Modified: trunk/libavcodec/bmp.c Log: Make BMP decoder use bytestream. Patch by Michel Bardiaux mbardiaux mediaxim dot be. Modified: trunk/libavcodec/bmp.c ============================================================================== --- trunk/libavcodec/bmp.c (original) +++ trunk/libavcodec/bmp.c Wed Jan 31 01:34:56 2007 @@ -20,13 +20,9 @@ */ #include "avcodec.h" -#include "bitstream.h" -#include "bswap.h" +#include "bytestream.h" #include "bmp.h" -#define read16(bits) bswap_16(get_bits(bits, 16)) -#define read32(bits) bswap_32(get_bits_long(bits, 32)) - static int bmp_decode_init(AVCodecContext *avctx){ BMPContext *s = avctx->priv_data; @@ -43,7 +39,6 @@ BMPContext *s = avctx->priv_data; AVFrame *picture = data; AVFrame *p = &s->picture; - GetBitContext bits; unsigned int fsize, hsize; int width, height; unsigned int depth; @@ -53,54 +48,54 @@ uint32_t rgb[3]; uint8_t *ptr; int dsize; + uint8_t *buf0 = buf; if(buf_size < 14){ av_log(avctx, AV_LOG_ERROR, "buf size too small (%d)\n", buf_size); return -1; } - init_get_bits(&bits, buf, buf_size); - - if(get_bits(&bits, 16) != 0x424d){ /* 'BM' */ + if(bytestream_get_byte(&buf) != 'B' || + bytestream_get_byte(&buf) != 'M') { av_log(avctx, AV_LOG_ERROR, "bad magic number\n"); return -1; } - fsize = read32(&bits); + fsize = bytestream_get_le32(&buf); if(buf_size < fsize){ av_log(avctx, AV_LOG_ERROR, "not enough data (%d < %d)\n", buf_size, fsize); return -1; } - skip_bits(&bits, 16); /* reserved1 */ - skip_bits(&bits, 16); /* reserved2 */ + buf += 2; /* reserved1 */ + buf += 2; /* reserved2 */ - hsize = read32(&bits); /* header size */ + hsize = bytestream_get_le32(&buf); /* header size */ if(fsize <= hsize){ av_log(avctx, AV_LOG_ERROR, "not enough data (%d < %d)\n", fsize, hsize); return -1; } - ihsize = read32(&bits); /* more header size */ + ihsize = bytestream_get_le32(&buf); /* more header size */ if(ihsize + 14 > hsize){ av_log(avctx, AV_LOG_ERROR, "invalid header size %d\n", hsize); return -1; } - width = read32(&bits); - height = read32(&bits); + width = bytestream_get_le32(&buf); + height = bytestream_get_le32(&buf); - if(read16(&bits) != 1){ /* planes */ + if(bytestream_get_le16(&buf) != 1){ /* planes */ av_log(avctx, AV_LOG_ERROR, "invalid BMP header\n"); return -1; } - depth = read16(&bits); + depth = bytestream_get_le16(&buf); if(ihsize > 16) - comp = read32(&bits); + comp = bytestream_get_le32(&buf); else comp = BMP_RGB; @@ -110,10 +105,10 @@ } if(comp == BMP_BITFIELDS){ - skip_bits(&bits, 20 * 8); - rgb[0] = read32(&bits); - rgb[1] = read32(&bits); - rgb[2] = read32(&bits); + buf += 20; + rgb[0] = bytestream_get_le32(&buf); + rgb[1] = bytestream_get_le32(&buf); + rgb[2] = bytestream_get_le32(&buf); } avctx->codec_id = CODEC_ID_BMP; @@ -169,7 +164,7 @@ p->pict_type = FF_I_TYPE; p->key_frame = 1; - buf += hsize; + buf = buf0 + hsize; dsize = buf_size - hsize; /* Line size in file multiple of 4 */

1 0

r7771 - trunk/configure
by subversion＠mplayerhq.hu 30 Jan '07

30 Jan '07

Author: diego Date: Tue Jan 30 23:12:02 2007 New Revision: 7771 Modified: trunk/configure Log: Clarify usage of external libs whose functionality exists natively. Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Tue Jan 30 23:12:02 2007 @@ -87,12 +87,15 @@ echo " --enable-faadbin build FAAD support with runtime linking [default=no]" echo " --enable-libgsm enable GSM support via libgsm [default=no]" echo " --enable-mp3lame enable MP3 encoding via libmp3lame [default=no]" - echo " --enable-libnut enable NUT support via libnut [default=no]" + echo " --enable-libnut enable NUT (de)muxing via libnut, native demuxer" + echo " exists [default=no]" echo " --enable-libogg enable Ogg muxing via libogg [default=no]" echo " --enable-libtheora enable Theora encoding via libtheora [default=no]" - echo " --enable-vorbis enable Vorbis en/decoding via libvorbis [default=no]" + echo " --enable-vorbis enable Vorbis en/decoding via libvorbis, native" + echo " implementations exist [default=no]" echo " --enable-x264 enable H.264 encoding via x264 [default=no]" - echo " --enable-xvid enable Xvid encoding via xvidcore [default=no]" + echo " --enable-xvid enable Xvid encoding via xvidcore, native" + echo " MPEG-4/Xvid encoder exists [default=no]" echo " --enable-amr_nb enable amr_nb float audio codec" echo " --enable-amr_nb-fixed use fixed point for amr-nb codec" echo " --enable-amr_wb enable amr_wb float audio codec"

3 2

r7772 - trunk/configure
by subversion＠mplayerhq.hu 30 Jan '07

30 Jan '07

Author: diego Date: Tue Jan 30 23:51:05 2007 New Revision: 7772 Modified: trunk/configure Log: slightly reformat --help output for ease of understanding Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Tue Jan 30 23:51:05 2007 @@ -87,15 +87,15 @@ echo " --enable-faadbin build FAAD support with runtime linking [default=no]" echo " --enable-libgsm enable GSM support via libgsm [default=no]" echo " --enable-mp3lame enable MP3 encoding via libmp3lame [default=no]" - echo " --enable-libnut enable NUT (de)muxing via libnut, native demuxer" - echo " exists [default=no]" + echo " --enable-libnut enable NUT (de)muxing via libnut," + echo " native demuxer exists [default=no]" echo " --enable-libogg enable Ogg muxing via libogg [default=no]" echo " --enable-libtheora enable Theora encoding via libtheora [default=no]" - echo " --enable-vorbis enable Vorbis en/decoding via libvorbis, native" - echo " implementations exist [default=no]" + echo " --enable-vorbis enable Vorbis en/decoding via libvorbis," + echo " native implementations exist [default=no]" echo " --enable-x264 enable H.264 encoding via x264 [default=no]" - echo " --enable-xvid enable Xvid encoding via xvidcore, native" - echo " MPEG-4/Xvid encoder exists [default=no]" + echo " --enable-xvid enable Xvid encoding via xvidcore," + echo " native MPEG-4/Xvid encoder exists [default=no]" echo " --enable-amr_nb enable amr_nb float audio codec" echo " --enable-amr_nb-fixed use fixed point for amr-nb codec" echo " --enable-amr_wb enable amr_wb float audio codec"

1 0

r7770 - trunk/configure
by subversion＠mplayerhq.hu 30 Jan '07

30 Jan '07

Author: diego Date: Tue Jan 30 23:05:21 2007 New Revision: 7770 Modified: trunk/configure Log: Clarify that libogg is for muxing only. Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Tue Jan 30 23:05:21 2007 @@ -88,7 +88,7 @@ echo " --enable-libgsm enable GSM support via libgsm [default=no]" echo " --enable-mp3lame enable MP3 encoding via libmp3lame [default=no]" echo " --enable-libnut enable NUT support via libnut [default=no]" - echo " --enable-libogg enable Ogg support via libogg [default=no]" + echo " --enable-libogg enable Ogg muxing via libogg [default=no]" echo " --enable-libtheora enable Theora encoding via libtheora [default=no]" echo " --enable-vorbis enable Vorbis en/decoding via libvorbis [default=no]" echo " --enable-x264 enable H.264 encoding via x264 [default=no]"

1 0

r7769 - trunk/configure
by subversion＠mplayerhq.hu 30 Jan '07

30 Jan '07

Author: diego Date: Tue Jan 30 22:57:26 2007 New Revision: 7769 Modified: trunk/configure Log: Clarify --help output about Vorbis and Theora. Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Tue Jan 30 22:57:26 2007 @@ -89,8 +89,8 @@ echo " --enable-mp3lame enable MP3 encoding via libmp3lame [default=no]" echo " --enable-libnut enable NUT support via libnut [default=no]" echo " --enable-libogg enable Ogg support via libogg [default=no]" - echo " --enable-libtheora enable Theora support via libtheora [default=no]" - echo " --enable-vorbis enable Vorbis support via libvorbis [default=no]" + echo " --enable-libtheora enable Theora encoding via libtheora [default=no]" + echo " --enable-vorbis enable Vorbis en/decoding via libvorbis [default=no]" echo " --enable-x264 enable H.264 encoding via x264 [default=no]" echo " --enable-xvid enable Xvid encoding via xvidcore [default=no]" echo " --enable-amr_nb enable amr_nb float audio codec"

1 0

r7768 - trunk/libavcodec/dvdsubdec.c
by subversion＠mplayerhq.hu 30 Jan '07

30 Jan '07

Author: takis Date: Tue Jan 30 15:24:12 2007 New Revision: 7768 Modified: trunk/libavcodec/dvdsubdec.c Log: Remove the getbe16 functions and use the AV_RB16 macro instead. Patch by Ian Caulfield, ian dot caulfield gmail dot com. Modified: trunk/libavcodec/dvdsubdec.c ============================================================================== --- trunk/libavcodec/dvdsubdec.c (original) +++ trunk/libavcodec/dvdsubdec.c Tue Jan 30 15:24:12 2007 @@ -27,11 +27,6 @@ return 0; } -static uint16_t getbe16(const uint8_t *p) -{ - return (p[0] << 8) | p[1]; -} - static int get_nibble(const uint8_t *buf, int nibble_offset) { return (buf[nibble_offset >> 1] >> ((1 - (nibble_offset & 1)) << 2)) & 0xf; @@ -142,10 +137,10 @@ sub_header->start_display_time = 0; sub_header->end_display_time = 0; - cmd_pos = getbe16(buf + 2); + cmd_pos = AV_RB16(buf + 2); while ((cmd_pos + 4) < buf_size) { - date = getbe16(buf + cmd_pos); - next_cmd_pos = getbe16(buf + cmd_pos + 2); + date = AV_RB16(buf + cmd_pos); + next_cmd_pos = AV_RB16(buf + cmd_pos + 2); #ifdef DEBUG av_log(NULL, AV_LOG_INFO, "cmd_pos=0x%04x next=0x%04x date=%d\n", cmd_pos, next_cmd_pos, date); @@ -211,8 +206,8 @@ case 0x06: if ((buf_size - pos) < 4) goto fail; - offset1 = getbe16(buf + pos); - offset2 = getbe16(buf + pos + 2); + offset1 = AV_RB16(buf + pos); + offset2 = AV_RB16(buf + pos + 2); #ifdef DEBUG av_log(NULL, AV_LOG_INFO, "offset1=0x%04x offset2=0x%04x\n", offset1, offset2); #endif @@ -438,7 +433,7 @@ if (pc->packet_index == 0) { if (buf_size < 2) return 0; - pc->packet_len = (buf[0] << 8) | buf[1]; + pc->packet_len = AV_RB16(buf); av_freep(&pc->packet); pc->packet = av_malloc(pc->packet_len); }

1 0

r7767 - trunk/libavcodec/dvdsubdec.c
by subversion＠mplayerhq.hu 30 Jan '07

30 Jan '07

Author: takis Date: Tue Jan 30 15:19:43 2007 New Revision: 7767 Modified: trunk/libavcodec/dvdsubdec.c Log: Fix a bug in the DVD subtitle decoder where subtitles with odd heights would not have the last line decoded, leaving the bottom line of the bitmap array uninitialised. Patch by Ian Caulfield, ian dot caulfield gmail dot com. Modified: trunk/libavcodec/dvdsubdec.c ============================================================================== --- trunk/libavcodec/dvdsubdec.c (original) +++ trunk/libavcodec/dvdsubdec.c Tue Jan 30 15:19:43 2007 @@ -249,7 +249,7 @@ sub_header->rects = av_mallocz(sizeof(AVSubtitleRect)); sub_header->num_rects = 1; sub_header->rects[0].rgba_palette = av_malloc(4 * 4); - decode_rle(bitmap, w * 2, w, h / 2, + decode_rle(bitmap, w * 2, w, (h + 1) / 2, buf, offset1 * 2, buf_size); decode_rle(bitmap + w, w * 2, w, h / 2, buf, offset2 * 2, buf_size);

1 0