January 2006 - ffmpeg-devel - lists.ffmpeg.org

[BUG] MPEG-4 artifacts, possibly demuxer-related
by b-o-n-d＠gmx.net 30 Jan '06

30 Jan '06

> On Mon, Jan 02, 2006 at 03:04:22PM +0100, Diego Biurrun wrote: > > Hey, I stumbled across another MPEG-4 file that shows artifacts: > > > > ftp://sandman.homedns.org/diego/ffmpeg/XviD_with_3_AAC-HE_audio_streams.avi > > > > I've tested with CVS MPlayer, CVS ffplay and MPlayer 1.0pre7try2. > > Interestingly xine CVS and vlc 0.8.4 play the file fine. This indicates > > a demuxer problem, but it would be present in both the MPlayer and the > > libavformat demuxer. The AVI file is an ODML AVI file. > > the file can be played correctly with lavf if you apply: > > @@ -303,6 +303,7 @@ > if (st->codec->codec_id == CODEC_ID_XAN_WC4) > xan_video = 1; > st->need_parsing = 2; //only parse headers dont do slower repacketization, this is needed to get the pict type which is needed for generating correct pts > + st->need_parsing = 1; > // url_fskip(pb, size - 5 * 4); > break; > case CODEC_TYPE_AUDIO: > > to avidec.c > > as far as i can see this AVI file has _many_ video frames in each chunk, sick > how can a person be capable of using a text editor (and writing software) and > at the same time be such a complete idiot writing a program generating so > broken avi files ... packed bitstream as used by xvid and divx?

2 1

[BUG] MPEG-4 file with artifacts
by diego＠biurrun.de 30 Jan '06

30 Jan '06

Hi, while reorganizing my samples collection, I stumbled across some samples that fail to decode properly. This one has MPEG-4 video that shows heavy artifacting: ftp://sandman.homedns.org/diego/ffmpeg/mpeg4_artifacts.mp4 ftp://sandman.homedns.org/diego/ffmpeg/mpeg4_artifacts_small.mp4 The first sample is 50MB, the second 1MB, but the small version already shows the problem quite visibly. ffplay fills the console with messages like [mpeg4 @ 0x10287df8]Error at MB: 672 [mpeg4 @ 0x10287df8]marker does not match f_code [mpeg4 @ 0x10287df8]concealing 593 DC, 593 AC, 593 MV errors [mpeg4 @ 0x10287df8]Error at MB: 672 [mpeg4 @ 0x10287df8]marker does not match f_code [mpeg4 @ 0x10287df8]concealing 593 DC, 593 AC, 593 MV errors [mpeg4 @ 0x10287df8]header damaged [mpeg4 @ 0x10287df8]ac-tex damaged at 24 23 [mpeg4 @ 0x10287df8]Error at MB: 967 [mpeg4 @ 0x10287df8]concealing 315 DC, 315 AC, 315 MV errors [mpeg4 @ 0x10287df8]header damaged [mpeg4 @ 0x10287df8]header damaged [mpeg4 @ 0x10287df8]ac-tex damaged at 3 5 Maybe the file is just damaged (beyond repair). I'd appreciate if somebody could confirm this. Diego

3 4

simple script for checking whitespaces, tabs, etc?
by lucabe72＠email.it 30 Jan '06

30 Jan '06

Hi all, I am almost ready to submit my video4linux2 input... But the editor I am using is doing weird things like converting spaces in tabs and similar stuff, so I fear the .c file might not respect the "no tabs" rule. Can anyone provide some perl (or similar) script for checking/fixing the whitespace stuff? (I am a perl illiterate :) I tried "indent -i4 -kr", as indicated in the docs, but here (debian unstable) it introduces a lot of tabs. Thanks, Luca -- _____________________________________________________________________________ Copy this in your signature, if you think it is important: N O W A R ! ! ! -- Email.it, the professional e-mail, gratis per te: http://www.email.it/f Sponsor: Scopri come proteggere dai virus il tuo computer e come eliminare * ogni tipo di virus! - clicca qui Clicca qui: http://adv.email.it/cgi-bin/foclick.cgi?mid=3212&d=30-1

1 1

[PATCH] part 8 - portability fixes (ILP32 vs LP64)
by freebsd＠sopwith.solgatos.com 30 Jan '06

30 Jan '06

Diffs for file: libavcodec/dvdsub.c =================================================================== RCS file: RCS/dvdsub.c,v retrieving revision 1.1 diff -u -r1.1 dvdsub.c --- dvdsub.c 2006/01/30 02:41:12 1.1 +++ dvdsub.c 2006/01/30 02:42:02 @@ -28,12 +28,12 @@ return 0; } -uint16_t getbe16(const uint8_t *p) +static uint16_t getbe16(const uint8_t *p) { return (p[0] << 8) | p[1]; } -int get_nibble(const uint8_t *buf, int nibble_offset) +static int get_nibble(const uint8_t *buf, int nibble_offset) { return (buf[nibble_offset >> 1] >> ((1 - (nibble_offset & 1)) << 2)) & 0xf; }

4 5

[PATCH] register_protocol
by mbardiaux＠mediaxim.be 30 Jan '06

30 Jan '06

The current implementation has several problems: (1) Call av_register_all, the register one of yours, then av_register_all again: yours is lost... Worse: register yours, call av_register_all, register yours again, you get... only yours. (2) Relies on a linked list that actually resides in klientland. Proposed patch removes reliance on a linked list that actually resides in klientland; and lets you re-register a builtin protocol (on your head...); and protects against multiple registrations of your own protocols. -- Michel Bardiaux R&D Director T +32 [0] 2 790 29 41 F +32 [0] 2 790 29 02 E mailto:mbardiaux at mediaxim.be Mediaxim NV/SA Vorstlaan 191 Boulevard du Souverain Brussel 1160 Bruxelles http://www.mediaxim.com/

2 4

Decode ISO MPEG4 with CODEC_ID_MPEG4: picture result align problem
by patrice.roulet＠free.fr 30 Jan '06

30 Jan '06

Dear All I am a newbies in the c++ utilisation of ffmpeg. I try to decompress ISO MPEG4 raw data with ffmpeg thanks to ffmpeg 0.4.9-pre1 After Decompression, I save the planar YUV4:2:0 AvFrame in a PPM file thanks to this method and the the picture line have not a good align void pgm_save(unsigned char *buf,int wrap, int xsize,int ysize,char *filename) { FILE *f; int i; f=fopen(filename,"w"); fprintf(f,"P5\n%d %d\n%d\n",xsize,ysize,255); for(i=0;i<ysize;i++) { fwrite(buf,1,xsize,f); buf+=wrap; } fclose(f); } Where buf=picture->data[0] wrap=picture->linesize[0] xsize=codecContex->width ysize=codecContex->height Do you have an idea about this problem? Many thanks for your help. Patrice

2 4

video4linux2 input for testing
by lucabe72＠email.it 30 Jan '06

30 Jan '06

Hi all, here is a preview of the video4linux input format I am developing. The code still has to be cleaned up a bit, and the only access method currently supported is mmap(), but I've been able to succesfully capture audio and video without problems. Video format selection seems to work well. I am interested in hearing some feedback, so anyone who has a video capture card is invited to test this new code - just copy v4l2.c over grab.c, recompile, and try something like ./ffmpeg -s 352x288 -pix_fmt <some pixel format> test.avi Thanks, Luca -- _____________________________________________________________________________ Copy this in your signature, if you think it is important: N O W A R ! ! ! -- Email.it, the professional e-mail, gratis per te: http://www.email.it/f Sponsor: Prova GRATIS per 15 giorni! DVDNetRent e ricevi a casa 3 film. Puoi scegliere tra migliaia di titoli Clicca qui: http://adv.email.it/cgi-bin/foclick.cgi?mid=4632&d=27-1

3 2

[PATCH] from DivX, Part 2: Multifile source
by slhomme＠divxcorp.com 29 Jan '06

29 Jan '06

This patch adds a new protocol input to do the simulation of file concatenation (not always available when you use the ffmpeg library). It should work on other OS too. The URL to use is : "multi:<file1>*<file2>*" It's mostly used for merging MPEG (VOB) files on the fly.

12 22

[PATCH] part 23 - portability fixes (ILP32 vs LP64)
by freebsd＠sopwith.solgatos.com 29 Jan '06

29 Jan '06

Diffs for file: libavcodec/resample2.c =================================================================== RCS file: RCS/resample2.c,v retrieving revision 1.1 diff -u -r1.1 resample2.c --- resample2.c 2006/01/26 21:02:11 1.1 +++ resample2.c 2006/01/29 22:09:55 @@ -28,22 +28,6 @@ #include "common.h" #include "dsputil.h" -#if 1 -#define FILTER_SHIFT 15 - -#define FELEM int16_t -#define FELEM2 int32_t -#define FELEM_MAX INT16_MAX -#define FELEM_MIN INT16_MIN -#else -#define FILTER_SHIFT 22 - -#define FELEM int32_t -#define FELEM2 int64_t -#define FELEM_MAX INT32_MAX -#define FELEM_MIN INT32_MIN -#endif - typedef struct AVResampleContext{ FELEM *filter_bank; @@ -62,7 +46,7 @@ /** * 0th order modified bessel function of the first kind. */ -double bessel(double x){ +static double bessel(double x){ double v=1; double t=1; int i; Diffs for file: libavutil/common.h =================================================================== RCS file: RCS/common.h,v retrieving revision 1.1 diff -u -r1.1 common.h --- common.h 2006/01/26 20:50:28 1.1 +++ common.h 2006/01/30 02:52:23 @@ -610,4 +610,33 @@ #endif /* HAVE_AV_CONFIG_H */ +/* moved from libavcodec/resample2.c + * needed here for av_build_filter() prototype below + */ +#if 1 +#define FILTER_SHIFT 15 + +#define FELEM int16_t +#define FELEM2 int32_t +#define FELEM_MAX INT16_MAX +#define FELEM_MIN INT16_MIN +#else +#define FILTER_SHIFT 22 + +#define FELEM int32_t +#define FELEM2 int64_t +#define FELEM_MAX INT32_MAX +#define FELEM_MIN INT32_MIN +#endif + + + /* prototypes */ +void av_build_filter(FELEM *, double, int, int, int, int); +void ff_h264_idct_add_mmx2(uint8_t *, int16_t *, int); +void ff_idct_xvid_mmx(short *); +void ff_idct_xvid_mmx2(short *); +void ff_vp3_dsp_init_mmx(void); +void ff_vp3_idct_mmx(int16_t *); +void ff_vp3_idct_sse2(int16_t *); + #endif /* COMMON_H */

1 0

[PATCH] part 22 - portability fixes (ILP32 vs LP64)
by freebsd＠sopwith.solgatos.com 29 Jan '06

29 Jan '06

Diffs for file: libavformat/avformat.h =================================================================== RCS file: RCS/avformat.h,v retrieving revision 1.1 diff -u -r1.1 avformat.h --- avformat.h 2006/01/26 22:44:56 1.1 +++ avformat.h 2006/01/26 22:45:46 @@ -713,5 +713,7 @@ } #endif +int gif_write(ByteIOContext *, AVImageInfo *); + #endif /* AVFORMAT_H */

1 0

[PATCH] part 21 - portability fixes (ILP32 vs LP64)
by freebsd＠sopwith.solgatos.com 29 Jan '06

29 Jan '06

Diffs for file: libavutil/intfloat_readwrite.c =================================================================== RCS file: RCS/intfloat_readwrite.c,v retrieving revision 1.1 diff -u -r1.1 intfloat_readwrite.c --- intfloat_readwrite.c 2006/01/29 21:52:58 1.1 +++ intfloat_readwrite.c 2006/01/29 21:57:14 @@ -24,6 +24,7 @@ */ #include "common.h" +#include "intfloat_readwrite.h" /* for prototypes */ double av_int2dbl(int64_t v){ if(v+v > 0xFFELLU<<52)

1 0

[PATCH] part 20 - portability fixes (ILP32 vs LP64)
by freebsd＠sopwith.solgatos.com 29 Jan '06

29 Jan '06

Diffs for file: vhook/watermark.c =================================================================== RCS file: RCS/watermark.c,v retrieving revision 1.1 diff -u -r1.1 watermark.c --- watermark.c 2006/01/29 22:20:46 1.1 +++ watermark.c 2006/01/29 22:21:17 @@ -47,6 +47,8 @@ #include "framehook.h" +#include "cmdutils.h" /* for parse_arg_file() prototype */ + typedef struct { char filename[2000]; int x_size;

1 0

[PATCH] part 19 - portability fixes (ILP32 vs LP64)
by freebsd＠sopwith.solgatos.com 29 Jan '06

29 Jan '06

Diffs for file: vhook/ppm.c =================================================================== RCS file: RCS/ppm.c,v retrieving revision 1.1 diff -u -r1.1 ppm.c --- ppm.c 2006/01/26 22:14:17 1.1 +++ ppm.c 2006/01/26 22:15:26 @@ -40,7 +40,7 @@ /** Create a bidirectional pipe for the given command. */ -rwpipe *rwpipe_open( int argc, char *argv[] ) +static rwpipe *rwpipe_open( int argc, char *argv[] ) { rwpipe *this = av_mallocz( sizeof( rwpipe ) ); @@ -94,7 +94,7 @@ /** Read data from the pipe. */ -FILE *rwpipe_reader( rwpipe *this ) +static FILE *rwpipe_reader( rwpipe *this ) { if ( this != NULL ) return this->reader; @@ -105,7 +105,7 @@ /** Write data to the pipe. */ -FILE *rwpipe_writer( rwpipe *this ) +static FILE *rwpipe_writer( rwpipe *this ) { if ( this != NULL ) return this->writer; @@ -116,7 +116,7 @@ /* Read a number from the pipe - assumes PNM style headers. */ -int rwpipe_read_number( rwpipe *rw ) +static int rwpipe_read_number( rwpipe *rw ) { int value = 0; int c = 0; @@ -147,7 +147,7 @@ /** Read a PPM P6 header. */ -int rwpipe_read_ppm_header( rwpipe *rw, int *width, int *height ) +static int rwpipe_read_ppm_header( rwpipe *rw, int *width, int *height ) { char line[ 3 ]; FILE *in = rwpipe_reader( rw ); @@ -167,7 +167,7 @@ /** Close the pipe and process. */ -void rwpipe_close( rwpipe *this ) +static void rwpipe_close( rwpipe *this ) { if ( this != NULL ) {

1 0

[PATCH] part 18 - portability fixes (ILP32 vs LP64)
by freebsd＠sopwith.solgatos.com 29 Jan '06

29 Jan '06

Diffs for file: vhook/drawtext.c =================================================================== RCS file: RCS/drawtext.c,v retrieving revision 1.1 diff -u -r1.1 drawtext.c --- drawtext.c 2006/01/26 22:16:09 1.1 +++ drawtext.c 2006/01/30 02:43:43 @@ -116,7 +116,7 @@ } -int ParseColor(char *text, unsigned char yuv_color[3]) +static int ParseColor(char *text, unsigned char yuv_color[3]) { char tmp[3]; unsigned char rgb_color[3]; @@ -300,7 +300,7 @@ -inline void draw_glyph(AVPicture *picture, FT_Bitmap *bitmap, unsigned int x, unsigned int y, unsigned int width, unsigned i nt height, unsigned char yuv_fgcolor[3], unsigned char yuv_bgcolor[3], int outline) +static inline void draw_glyph(AVPicture *picture, FT_Bitmap *bitmap, unsigned int x, unsigned int y, unsigned int width, uns igned int height, unsigned char yuv_fgcolor[3], unsigned char yuv_bgcolor[3], int outline) { int r, c; int spixel, dpixel[3], in_glyph=0; @@ -363,7 +363,7 @@ } -inline void draw_box(AVPicture *picture, unsigned int x, unsigned int y, unsigned int width, unsigned int height, unsigned c har yuv_color[3]) +static inline void draw_box(AVPicture *picture, unsigned int x, unsigned int y, unsigned int width, unsigned int height, uns igned char yuv_color[3]) { int i, j;

1 0

[PATCH] part 17 - portability fixes (ILP32 vs LP64)
by freebsd＠sopwith.solgatos.com 29 Jan '06

29 Jan '06

Diffs for file: libavformat/matroska.c =================================================================== RCS file: RCS/matroska.c,v retrieving revision 1.1 diff -u -r1.1 matroska.c --- matroska.c 2006/01/29 21:43:38 1.1 +++ matroska.c 2006/01/29 21:44:58 @@ -29,6 +29,7 @@ #include "avformat.h" /* For codec_get_bmp_id and codec_get_wav_id. */ #include "avi.h" +#include "intfloat_readwrite.h" /* for av_int2dbl() prototype */ /* EBML version supported */ #define EBML_VERSION 1

1 0

[PATCH] part 16 - portability fixes (ILP32 vs LP64)
by freebsd＠sopwith.solgatos.com 29 Jan '06

29 Jan '06

Diffs for file: ./ffmpeg.c =================================================================== RCS file: RCS/ffmpeg.c,v retrieving revision 1.1 diff -u -r1.1 ffmpeg.c --- ffmpeg.c 2006/01/30 02:44:13 1.1 +++ ffmpeg.c 2006/01/30 02:45:40 @@ -3789,7 +3789,7 @@ exit(1); } -void parse_matrix_coeffs(uint16_t *dest, const char *str) +static void parse_matrix_coeffs(uint16_t *dest, const char *str) { int i; const char *p = str; @@ -3806,13 +3806,13 @@ } } -void opt_inter_matrix(const char *arg) +static void opt_inter_matrix(const char *arg) { inter_matrix = av_mallocz(sizeof(uint16_t) * 64); parse_matrix_coeffs(inter_matrix, arg); } -void opt_intra_matrix(const char *arg) +static void opt_intra_matrix(const char *arg) { intra_matrix = av_mallocz(sizeof(uint16_t) * 64); parse_matrix_coeffs(intra_matrix, arg);

1 0

[PATCH] part 15 - portability fixes (ILP32 vs LP64)
by freebsd＠sopwith.solgatos.com 29 Jan '06

29 Jan '06

Diffs for file: libavcodec/vorbis.c =================================================================== RCS file: RCS/vorbis.c,v retrieving revision 1.1 diff -u -r1.1 vorbis.c --- vorbis.c 2006/01/26 21:40:00 1.1 +++ vorbis.c 2006/01/26 21:40:12 @@ -46,7 +46,7 @@ /** * reads 0-32 bits when using the ALT_BITSTREAM_READER_LE bitstream reader */ -unsigned int get_bits_long_le(GetBitContext *s, int n){ +static unsigned int get_bits_long_le(GetBitContext *s, int n){ if(n<=17) return get_bits(s, n); else{ int ret= get_bits(s, 16);

1 0

[PATCH] part 14 - portability fixes (ILP32 vs LP64)
by freebsd＠sopwith.solgatos.com 29 Jan '06

29 Jan '06

Diffs for file: libavcodec/vc9.c =================================================================== RCS file: RCS/vc9.c,v retrieving revision 1.1 diff -u -r1.1 vc9.c --- vc9.c 2006/01/26 21:34:40 1.1 +++ vc9.c 2006/01/26 23:13:08 @@ -929,7 +929,7 @@ * @todo TODO: Take into account stride * @todo TODO: Allow use of external buffers ? */ -int alloc_bitplane(BitPlane *bp, int width, int height) +static int alloc_bitplane(BitPlane *bp, int width, int height) { if (!bp || bp->width<0 || bp->height<0) return -1; bp->data = (uint8_t*)av_malloc(width*height); @@ -942,7 +942,7 @@ /** Free the bitplane's buffer * @param bp Bitplane which buffer is to free */ -void free_bitplane(BitPlane *bp) +static void free_bitplane(BitPlane *bp) { bp->width = bp->stride = bp->height = 0; if (bp->data) av_freep(&bp->data); @@ -1832,7 +1832,7 @@ * @todo TODO: Process the blocks * @todo TODO: Use M$ MPEG-4 cbp prediction */ -int vc9_decode_block(VC9Context *v, DCTELEM block[64], int n, int coded, int mquant) +static int vc9_decode_block(VC9Context *v, DCTELEM block[64], int n, int coded, int mquant) { GetBitContext *gb = &v->s.gb; MpegEncContext *s = &v->s; @@ -1979,7 +1979,7 @@ /** Decode one I-frame MB (in Simple/Main profile) * @todo TODO: Extend to AP */ -int vc9_decode_i_mb(VC9Context *v, DCTELEM block[6][64]) +static int vc9_decode_i_mb(VC9Context *v, DCTELEM block[6][64]) { int i, cbp, val; uint8_t *coded_val; @@ -2013,7 +2013,7 @@ * @todo TODO: Extend to AP * @fixme FIXME: DC value for inter blocks not set */ -int vc9_decode_p_mb(VC9Context *v, DCTELEM block[6][64]) +static int vc9_decode_p_mb(VC9Context *v, DCTELEM block[6][64]) { MpegEncContext *s = &v->s; GetBitContext *gb = &s->gb; @@ -2160,7 +2160,7 @@ * @warning XXX: Used for decoding BI MBs * @fixme FIXME: DC value for inter blocks not set */ -int vc9_decode_b_mb(VC9Context *v, DCTELEM block[6][64]) +static int vc9_decode_b_mb(VC9Context *v, DCTELEM block[6][64]) { MpegEncContext *s = &v->s; GetBitContext *gb = &v->s.gb;

1 0

[PATCH] part 13 - portability fixes (ILP32 vs LP64)
by freebsd＠sopwith.solgatos.com 29 Jan '06

29 Jan '06

Diffs for file: libavcodec/utils.c =================================================================== RCS file: RCS/utils.c,v retrieving revision 1.1 diff -u -r1.1 utils.c --- utils.c 2006/01/26 21:04:22 1.1 +++ utils.c 2006/01/26 21:04:46 @@ -149,9 +149,9 @@ * Call av_free_static automatically before it's too late */ -static void do_free() __attribute__ ((destructor)); +static void do_free(void) __attribute__ ((destructor)); -static void do_free() +static void do_free(void) { av_free_static(); }

1 0

[PATCH] part 11 - portability fixes (ILP32 vs LP64)
by freebsd＠sopwith.solgatos.com 29 Jan '06

29 Jan '06

Diffs for file: ./output_example.c =================================================================== RCS file: RCS/output_example.c,v retrieving revision 1.1 diff -u -r1.1 output_example.c --- output_example.c 2006/01/26 22:11:23 1.1 +++ output_example.c 2006/01/30 02:46:28 @@ -51,7 +51,7 @@ /* * add an audio output stream */ -AVStream *add_audio_stream(AVFormatContext *oc, int codec_id) +static AVStream *add_audio_stream(AVFormatContext *oc, int codec_id) { AVCodecContext *c; AVStream *st; @@ -73,7 +73,7 @@ return st; } -void open_audio(AVFormatContext *oc, AVStream *st) +static void open_audio(AVFormatContext *oc, AVStream *st) { AVCodecContext *c; AVCodec *codec; @@ -124,7 +124,7 @@ /* prepare a 16 bit dummy audio frame of 'frame_size' samples and 'nb_channels' channels */ -void get_audio_frame(int16_t *samples, int frame_size, int nb_channels) +static void get_audio_frame(int16_t *samples, int frame_size, int nb_channels) { int j, i, v; int16_t *q; @@ -139,7 +139,7 @@ } } -void write_audio_frame(AVFormatContext *oc, AVStream *st) +static void write_audio_frame(AVFormatContext *oc, AVStream *st) { AVCodecContext *c; AVPacket pkt; @@ -163,7 +163,7 @@ } } -void close_audio(AVFormatContext *oc, AVStream *st) +static void close_audio(AVFormatContext *oc, AVStream *st) { avcodec_close(st->codec); @@ -179,7 +179,7 @@ int frame_count, video_outbuf_size; /* add a video output stream */ -AVStream *add_video_stream(AVFormatContext *oc, int codec_id) +static AVStream *add_video_stream(AVFormatContext *oc, int codec_id) { AVCodecContext *c; AVStream *st; @@ -224,7 +224,7 @@ return st; } -AVFrame *alloc_picture(int pix_fmt, int width, int height) +static AVFrame *alloc_picture(int pix_fmt, int width, int height) { AVFrame *picture; uint8_t *picture_buf; @@ -244,7 +244,7 @@ return picture; } -void open_video(AVFormatContext *oc, AVStream *st) +static void open_video(AVFormatContext *oc, AVStream *st) { AVCodec *codec; AVCodecContext *c; @@ -293,7 +293,7 @@ } /* prepare a dummy image */ -void fill_yuv_image(AVFrame *pict, int frame_index, int width, int height) +static void fill_yuv_image(AVFrame *pict, int frame_index, int width, int height) { int x, y, i; @@ -315,7 +315,7 @@ } } -void write_video_frame(AVFormatContext *oc, AVStream *st) +static void write_video_frame(AVFormatContext *oc, AVStream *st) { int out_size, ret; AVCodecContext *c; @@ -380,7 +380,7 @@ frame_count++; } -void close_video(AVFormatContext *oc, AVStream *st) +static void close_video(AVFormatContext *oc, AVStream *st) { avcodec_close(st->codec); av_free(picture->data[0]);

1 0

[PATCH] part 9 - portability fixes (ILP32 vs LP64)
by freebsd＠sopwith.solgatos.com 29 Jan '06

29 Jan '06

Diffs for file: libavcodec/mem.c =================================================================== RCS file: RCS/mem.c,v retrieving revision 1.1 diff -u -r1.1 mem.c --- mem.c 2006/01/26 20:57:04 1.1 +++ mem.c 2006/01/26 20:57:57 @@ -46,7 +46,7 @@ { void *ptr; #ifdef MEMALIGN_HACK - int diff; + long diff; #endif /* lets disallow possible ambiguous cases */ @@ -55,7 +55,7 @@ #ifdef MEMALIGN_HACK ptr = malloc(size+16+1); - diff= ((-(int)ptr - 1)&15) + 1; + diff= ((-(long)ptr - 1)&15) + 1; ptr += diff; ((char*)ptr)[-1]= diff; #elif defined (HAVE_MEMALIGN)

1 0

[PATCH] part 7 - portability fixes (ILP32 vs LP64)
by freebsd＠sopwith.solgatos.com 29 Jan '06

29 Jan '06

Diffs for file: libavcodec/dsputil.h =================================================================== RCS file: RCS/dsputil.h,v retrieving revision 1.1 diff -u -r1.1 dsputil.h --- dsputil.h 2006/01/29 22:15:26 1.1 +++ dsputil.h 2006/01/29 22:17:30 @@ -597,4 +597,6 @@ return score;\ } +void ff_spatial_dwt(int *, int, int, int, int, int); + #endif

1 0

[PATCH] part 6 - portability fixes (ILP32 vs LP64)
by freebsd＠sopwith.solgatos.com 29 Jan '06

29 Jan '06

Diffs for file: libavcodec/liba52/resample.c =================================================================== RCS file: RCS/resample.c,v retrieving revision 1.1 diff -u -r1.1 resample.c --- resample.c 2006/01/30 02:39:13 1.1 +++ resample.c 2006/01/30 02:39:30 @@ -17,7 +17,7 @@ #include "resample_mmx.c" #endif -void* a52_resample_init(uint32_t mm_accel,int flags,int chans){ +static void* a52_resample_init(uint32_t mm_accel,int flags,int chans){ void* tmp; #ifdef ARCH_X86

1 0

[PATCH] part 5 - portability fixes (ILP32 vs LP64)
by freebsd＠sopwith.solgatos.com 29 Jan '06

29 Jan '06

Diffs for file: libavcodec/liba52/crc.c =================================================================== RCS file: RCS/crc.c,v retrieving revision 1.1 diff -u -r1.1 crc.c --- crc.c 2006/01/26 21:41:09 1.1 +++ crc.c 2006/01/29 22:24:05 @@ -24,6 +24,7 @@ #include <stdlib.h> #include <stdio.h> #include <inttypes.h> +#include "a52_util.h" /* for a52_crc16_block() prototype */ static const uint16_t crc_lut[256] = {

1 0

gcc4 support & MMX fixups (from Debian)
by mike＠multimedia.cx 29 Jan '06

29 Jan '06

A xine developer just committed this and a few other fixes to the xine tree. Are they worth rolling into the official tree? -- -Mike Melanson -------- Original Message -------- Subject: [xine-cvs] CVS: xine-lib/src/libffmpeg/libavcodec/i386 dsputil_mmx.c,1.23,1.23.2.1 Date: Sun, 08 Jan 2006 07:21:47 -0800 From: Darren Salt <dsalt at users.sourceforge.net> To: xine-cvslog at lists.sourceforge.net Update of /cvsroot/xine/xine-lib/src/libffmpeg/libavcodec/i386 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1237/src/libffmpeg/libavcodec/i386 Modified Files: Tag: xine-1_0 dsputil_mmx.c Log Message: gcc4 support & MMX fixups (from Debian). Index: dsputil_mmx.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/libffmpeg/libavcodec/i386/dsputil_mmx.c,v retrieving revision 1.23 retrieving revision 1.23.2.1 diff -u -r1.23 -r1.23.2.1 --- dsputil_mmx.c 30 May 2004 19:24:23 -0000 1.23 +++ dsputil_mmx.c 8 Jan 2006 15:21:45 -0000 1.23.2.1 @@ -643,26 +643,22 @@ "punpcklwd %%mm0, %%mm1 \n\t" "punpckhwd %%mm4, %%mm3 \n\t" "punpckhwd %%mm0, %%mm6 \n\t" - "movd %%mm5, %0 \n\t" + "movd %%mm5, (%0) \n\t" "punpckhdq %%mm5, %%mm5 \n\t" - "movd %%mm5, %1 \n\t" - "movd %%mm3, %2 \n\t" + "movd %%mm5, (%0,%2) \n\t" + "movd %%mm3, (%0,%2,2) \n\t" "punpckhdq %%mm3, %%mm3 \n\t" - "movd %%mm3, %3 \n\t" - "movd %%mm1, %4 \n\t" + "movd %%mm3, (%0,%3) \n\t" + "movd %%mm1, (%1) \n\t" "punpckhdq %%mm1, %%mm1 \n\t" - "movd %%mm1, %5 \n\t" - "movd %%mm6, %6 \n\t" + "movd %%mm1, (%1,%2) \n\t" + "movd %%mm6, (%1,%2,2) \n\t" "punpckhdq %%mm6, %%mm6 \n\t" - "movd %%mm6, %7 \n\t" - : "=m" (*(uint32_t*)(src + 0*stride)), - "=m" (*(uint32_t*)(src + 1*stride)), - "=m" (*(uint32_t*)(src + 2*stride)), - "=m" (*(uint32_t*)(src + 3*stride)), - "=m" (*(uint32_t*)(src + 4*stride)), - "=m" (*(uint32_t*)(src + 5*stride)), - "=m" (*(uint32_t*)(src + 6*stride)), - "=m" (*(uint32_t*)(src + 7*stride)) + "movd %%mm6, (%1,%3) \n\t" + :: "r" (src), + "r" (src + 4*stride), + "r" ((long) stride ), + "r" ((long)(3*stride)) ); } ------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click _______________________________________________ Xine-cvslog mailing list Xine-cvslog at lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/xine-cvslog

8 9