headers
bcoudurier | 1 Mar 2007 11:00
Picon

r8165 - trunk/ffplay.c

Author: bcoudurier
Date: Thu Mar  1 11:00:07 2007
New Revision: 8165

Modified:
   trunk/ffplay.c

Log:
fix frame size option, patch by Limin Wang, lance lmwang gmail com

Modified: trunk/ffplay.c
==============================================================================
--- trunk/ffplay.c	(original)
+++ trunk/ffplay.c	Thu Mar  1 11:00:07 2007
 <at>  <at>  -2341,7 +2341,7  <at>  <at>  static void event_loop(void)

 static void opt_frame_size(const char *arg)
 {
-    if (parse_image_size(&screen_width, &screen_height, arg) < 0) {
+    if (parse_image_size(&frame_width, &frame_height, arg) < 0) {
         fprintf(stderr, "Incorrect frame size\n");
         exit(1);
     }
Permalink | Reply | 0 comments |
headers
bcoudurier | 1 Mar 2007 11:24
Picon

r8166 - trunk/libavcodec/avcodec.h

Author: bcoudurier
Date: Thu Mar  1 11:24:07 2007
New Revision: 8166

Modified:
   trunk/libavcodec/avcodec.h

Log:
define MPEG4AAC id to AAC, and get rid of it and MP3LAME id with next major bump

Modified: trunk/libavcodec/avcodec.h
==============================================================================
--- trunk/libavcodec/avcodec.h	(original)
+++ trunk/libavcodec/avcodec.h	Thu Mar  1 11:24:07 2007
 <at>  <at>  -249,8 +249,11  <at>  <at>  enum CodecID {
                          stream (only used by libavformat) */
 };

+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
 /* CODEC_ID_MP3LAME is absolete */
 #define CODEC_ID_MP3LAME CODEC_ID_MP3
+#define CODEC_ID_MPEG4AAC CODEC_ID_AAC
+#endif

 enum CodecType {
     CODEC_TYPE_UNKNOWN = -1,
Permalink | Reply | 0 comments |
headers
bcoudurier | 1 Mar 2007 11:29
Picon

r8167 - in trunk/libavcodec: avcodec.h mpegvideo.c

Author: bcoudurier
Date: Thu Mar  1 11:29:03 2007
New Revision: 8167

Modified:
   trunk/libavcodec/avcodec.h
   trunk/libavcodec/mpegvideo.c

Log:
get rid of CODEC_FLAG_H263P_AIC with next major bump

Modified: trunk/libavcodec/avcodec.h
==============================================================================
--- trunk/libavcodec/avcodec.h	(original)
+++ trunk/libavcodec/avcodec.h	Thu Mar  1 11:29:03 2007
 <at>  <at>  -355,7 +355,9  <at>  <at>  typedef struct RcOverride{
 #define CODEC_FLAG_GLOBAL_HEADER  0x00400000 ///< place global headers in extradata instead of every keyframe
 #define CODEC_FLAG_BITEXACT       0x00800000 ///< use only bitexact stuff (except (i)dct)
 /* Fx : Flag for h263+ extra options */
+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
 #define CODEC_FLAG_H263P_AIC      0x01000000 ///< H263 Advanced intra coding / MPEG4 AC prediction (remove this)
+#endif
 #define CODEC_FLAG_AC_PRED        0x01000000 ///< H263 Advanced intra coding / MPEG4 AC prediction
 #define CODEC_FLAG_H263P_UMV      0x02000000 ///< Unlimited motion vector
 #define CODEC_FLAG_CBP_RD         0x04000000 ///< use rate distortion optimization for cbp

Modified: trunk/libavcodec/mpegvideo.c
==============================================================================
--- trunk/libavcodec/mpegvideo.c	(original)
+++ trunk/libavcodec/mpegvideo.c	Thu Mar  1 11:29:03 2007
(Continue reading)

Permalink | Reply | 0 comments |
headers
Michael Niedermayer | 1 Mar 2007 13:03
Picon
Picon

Re: r8140 - trunk/libavcodec/dsputil.c

Hi

On Wed, Feb 28, 2007 at 12:01:37PM +0100, Diego Biurrun wrote:
> On Wed, Feb 28, 2007 at 11:11:37AM +0200, Oded Shimon wrote:
> > On Tue, Feb 27, 2007 at 01:24:50AM +0100, diego wrote:
> > > 
> > > Log:
> > > The Snow DEcoding routines should be under CONFIG_SNOW_DECODER.
> > > 
> > > --- trunk/libavcodec/dsputil.c	(original)
> > > +++ trunk/libavcodec/dsputil.c	Tue Feb 27 01:24:49 2007
> > >  <at>  <at>  -4097,7 +4097,7  <at>  <at>  void dsputil_init(DSPContext* c, AVCodec
> > >      c->try_8x8basis= try_8x8basis_c;
> > >      c->add_8x8basis= add_8x8basis_c;
> > >  
> > > -#ifdef CONFIG_SNOW_ENCODER
> > > +#ifdef CONFIG_SNOW_DECODER
> > >      c->vertical_compose97i = ff_snow_vertical_compose97i;
> > >      c->horizontal_compose97i = ff_snow_horizontal_compose97i;
> > >      c->inner_add_yblock = ff_snow_inner_add_yblock;
> > 
> > I think this is still a bit wrong... both the encoder and decoder use 
> > these functions. I think this will cause encoding to segfault (NULL 
> > function pointer) if you compile the snow encoder without the decoder...
> 
> The decoder segfaulted before..
> 
> The problem is that I do not have a working Snow sample to test with.

look into tests/data/*snow*
(Continue reading)

Permalink | Reply | 0 comments |
headers
bcoudurier | 1 Mar 2007 14:03
Picon

r8168 - in trunk: libavcodec/raw.c libavformat/mov.c

Author: bcoudurier
Date: Thu Mar  1 14:03:33 2007
New Revision: 8168

Modified:
   trunk/libavcodec/raw.c
   trunk/libavformat/mov.c

Log:
quicktime 'raw ' support

Modified: trunk/libavcodec/raw.c
==============================================================================
--- trunk/libavcodec/raw.c	(original)
+++ trunk/libavcodec/raw.c	Thu Mar  1 14:03:33 2007
 <at>  <at>  -63,9 +63,27  <at>  <at>  static const PixelFormatTag pixelFormatT
     { -1, 0 },
 };

-static int findPixelFormat(unsigned int fourcc)
+static const PixelFormatTag pixelFormatBpsAVI[] = {
+    { PIX_FMT_PAL8,    8 },
+    { PIX_FMT_RGB555, 15 },
+    { PIX_FMT_RGB555, 16 },
+    { PIX_FMT_BGR24,  24 },
+    { PIX_FMT_RGB32,  32 },
+    { -1, 0 },
+};
+
+static const PixelFormatTag pixelFormatBpsMOV[] = {
(Continue reading)

Permalink | Reply | 0 comments |
headers
gpoirier | 1 Mar 2007 15:33
Picon

r8169 - trunk/ffmpeg.c

Author: gpoirier
Date: Thu Mar  1 15:33:57 2007
New Revision: 8169

Modified:
   trunk/ffmpeg.c

Log:
duplicate *_opts for every codec types, in order to have the  "ab" and "b" options work in the same manner
patch by Benoit Fouet %benoit P fouet A purplelabs P com%
Orginal thread:
Date: Feb 22, 2007 11:15 AM
Subject: [Ffmpeg-devel] [PATCH] ffmpeg.c duplicate *_opts for every codec types

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	(original)
+++ trunk/ffmpeg.c	Thu Mar  1 15:33:57 2007
 <at>  <at>  -206,7 +206,7  <at>  <at>  static int sws_flags = SWS_BICUBIC;

 const char **opt_names=NULL;
 int opt_name_count=0;
-AVCodecContext *avctx_opts;
+AVCodecContext *avctx_opts[CODEC_TYPE_NB];
 AVFormatContext *avformat_opts;

 static AVBitStreamFilterContext *video_bitstream_filters=NULL;
 <at>  <at>  -781,7 +781,7  <at>  <at>  static void do_video_out(AVFormatContext
             /* better than nothing: use input picture interlaced
                settings */
(Continue reading)

Permalink | Reply | 0 comments |
headers
michael | 1 Mar 2007 15:49
Picon

r8170 - trunk/doc/faq.texi

Author: michael
Date: Thu Mar  1 15:49:30 2007
New Revision: 8170

Modified:
   trunk/doc/faq.texi

Log:
decoding rtp

Modified: trunk/doc/faq.texi
==============================================================================
--- trunk/doc/faq.texi	(original)
+++ trunk/doc/faq.texi	Thu Mar  1 15:49:30 2007
 <at>  <at>  -327,4 +327,11  <at>  <at>  and libmpdemux/demux_lavf.c in MPlayer s

 The standard MSys bash (2.04) is broken. You need to install 2.05 or later.

+ <at> section I tried to pass rtp packets into a decoder, it doesnt work
+
+Of course not, you MUST strip ALL rtp headers and assemble valid packets
+first, a mp3 decoder decodes mp3 packets not bastarized mp3 encapsulated in
+rtp, the same applies to all decoders, this is not even ffmpeg or libavcodec
+specific
+
  <at> bye
Permalink | Reply | 0 comments |
headers
takis | 1 Mar 2007 16:27
Picon

r8171 - trunk/libavcodec/avcodec.h

Author: takis
Date: Thu Mar  1 16:27:26 2007
New Revision: 8171

Modified:
   trunk/libavcodec/avcodec.h

Log:
Add documentation to some avcodec.h's pix_fmt related functions and defines.

Modified: trunk/libavcodec/avcodec.h
==============================================================================
--- trunk/libavcodec/avcodec.h	(original)
+++ trunk/libavcodec/avcodec.h	Thu Mar  1 16:27:26 2007
 <at>  <at>  -2496,21 +2496,54  <at>  <at>  void avcodec_set_dimensions(AVCodecConte
 enum PixelFormat avcodec_get_pix_fmt(const char* name);
 unsigned int avcodec_pix_fmt_to_codec_tag(enum PixelFormat p);

-#define FF_LOSS_RESOLUTION  0x0001 /* loss due to resolution change */
-#define FF_LOSS_DEPTH       0x0002 /* loss due to color depth change */
-#define FF_LOSS_COLORSPACE  0x0004 /* loss due to color space conversion */
-#define FF_LOSS_ALPHA       0x0008 /* loss of alpha bits */
-#define FF_LOSS_COLORQUANT  0x0010 /* loss due to color quantization */
-#define FF_LOSS_CHROMA      0x0020 /* loss of chroma (e.g. rgb to gray conversion) */
+#define FF_LOSS_RESOLUTION  0x0001 /**≤ loss due to resolution change */
+#define FF_LOSS_DEPTH       0x0002 /**≤ loss due to color depth change */
+#define FF_LOSS_COLORSPACE  0x0004 /**≤ loss due to color space conversion */
+#define FF_LOSS_ALPHA       0x0008 /**≤ loss of alpha bits */
+#define FF_LOSS_COLORQUANT  0x0010 /**≤ loss due to color quantization */
+#define FF_LOSS_CHROMA      0x0020 /**≤ loss of chroma (e.g. RGB to gray conversion) */
(Continue reading)

Permalink | Reply | 0 comments |
headers
bcoudurier | 1 Mar 2007 17:36
Picon

r8172 - in trunk: ffmpeg.c libavcodec/utils.c

Author: bcoudurier
Date: Thu Mar  1 17:36:38 2007
New Revision: 8172

Modified:
   trunk/ffmpeg.c
   trunk/libavcodec/utils.c

Log:
remove ps option and rename rtp_payload_size AVOption to ps

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	(original)
+++ trunk/ffmpeg.c	Thu Mar  1 17:36:38 2007
 <at>  <at>  -127,7 +127,6  <at>  <at>  static int video_codec_id = CODEC_ID_NON
 static int video_codec_tag = 0;
 static int same_quality = 0;
 static int do_deinterlace = 0;
-static int packet_size = 0;
 static int strict = 0;
 static int top_field_first = -1;
 static int me_threshold = 0;
 <at>  <at>  -2305,11 +2304,6  <at>  <at>  static void opt_qdiff(const char *arg)
     }
 }

-static void opt_packet_size(const char *arg)
-{
-    packet_size= atoi(arg);
(Continue reading)

Permalink | Reply | 0 comments |
headers
bcoudurier | 1 Mar 2007 17:40
Picon

r8173 - trunk/libavformat/utils.c

Author: bcoudurier
Date: Thu Mar  1 17:40:48 2007
New Revision: 8173

Modified:
   trunk/libavformat/utils.c

Log:
check for any seeking failure during probe

Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c	(original)
+++ trunk/libavformat/utils.c	Thu Mar  1 17:40:48 2007
 <at>  <at>  -478,7 +478,7  <at>  <at>  int av_open_input_file(AVFormatContext *
             /* read probe data */
             pd->buf= av_realloc(pd->buf, probe_size);
             pd->buf_size = get_buffer(pb, pd->buf, probe_size);
-            if (url_fseek(pb, 0, SEEK_SET) == (offset_t)AVERROR(EPIPE)) {
+            if (url_fseek(pb, 0, SEEK_SET) < 0) {
                 url_fclose(pb);
                 if (url_fopen(pb, filename, URL_RDONLY) < 0) {
                     file_opened = 0;
Permalink | Reply | 0 comments |

Gmane