headers
diego | 1 Feb 2009 01:20
Picon

r16910 - in trunk/libavutil: rational.c rational.h

Author: diego
Date: Sun Feb  1 01:20:45 2009
New Revision: 16910

Log:
cosmetics: Use 'num' instead of 'nom' as abbreviation for numerator.

Modified:
   trunk/libavutil/rational.c
   trunk/libavutil/rational.h

Modified: trunk/libavutil/rational.c
==============================================================================
--- trunk/libavutil/rational.c	Sat Jan 31 23:49:58 2009	(r16909)
+++ trunk/libavutil/rational.c	Sun Feb  1 01:20:45 2009	(r16910)
 <at>  <at>  -33,23 +33,23  <at>  <at> 
 #include "mathematics.h"
 #include "rational.h"

-int av_reduce(int *dst_nom, int *dst_den, int64_t nom, int64_t den, int64_t max){
+int av_reduce(int *dst_num, int *dst_den, int64_t num, int64_t den, int64_t max){
     AVRational a0={0,1}, a1={1,0};
-    int sign= (nom<0) ^ (den<0);
-    int64_t gcd= av_gcd(FFABS(nom), FFABS(den));
+    int sign= (num<0) ^ (den<0);
+    int64_t gcd= av_gcd(FFABS(num), FFABS(den));

     if(gcd){
-        nom = FFABS(nom)/gcd;
+        num = FFABS(num)/gcd;
(Continue reading)

Permalink | Reply | 0 comments |
headers
diego | 1 Feb 2009 02:29
Picon

r16911 - in trunk/libavcodec: flicvideo.c mmvideo.c

Author: diego
Date: Sun Feb  1 02:29:30 2009
New Revision: 16911

Log:
Fix filenames in doxygen comments.

Modified:
   trunk/libavcodec/flicvideo.c
   trunk/libavcodec/mmvideo.c

Modified: trunk/libavcodec/flicvideo.c
==============================================================================
--- trunk/libavcodec/flicvideo.c	Sun Feb  1 01:20:45 2009	(r16910)
+++ trunk/libavcodec/flicvideo.c	Sun Feb  1 02:29:30 2009	(r16911)
 <at>  <at>  -20,7 +20,7  <at>  <at> 
  */

 /**
- *  <at> file flic.c
+ *  <at> file flicvideo.c
  * Autodesk Animator FLI/FLC Video Decoder
  * by Mike Melanson (melanson <at> pcisys.net)
  * for more information on the .fli/.flc file format and all of its many

Modified: trunk/libavcodec/mmvideo.c
==============================================================================
--- trunk/libavcodec/mmvideo.c	Sun Feb  1 01:20:45 2009	(r16910)
+++ trunk/libavcodec/mmvideo.c	Sun Feb  1 02:29:30 2009	(r16911)
 <at>  <at>  -20,7 +20,7  <at>  <at>
(Continue reading)

Permalink | Reply | 0 comments |
headers
diego | 1 Feb 2009 03:00
Picon

r16912 - in trunk: libavcodec/4xm.c libavcodec/8bps.c libavcodec/8svx.c libavcodec/aac.c libavcodec/aac.h libavcodec/aacdectab.h libavcodec/aacenc.c libavcodec/aacpsy.c libavcodec/aactab.c libavcod...

Author: diego
Date: Sun Feb  1 03:00:19 2009
New Revision: 16912

Log:
Use full internal pathname in doxygen  <at> file directives.
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.

Modified:
   trunk/libavcodec/4xm.c
   trunk/libavcodec/8bps.c
   trunk/libavcodec/8svx.c
   trunk/libavcodec/aac.c
   trunk/libavcodec/aac.h
   trunk/libavcodec/aacdectab.h
   trunk/libavcodec/aacenc.c
   trunk/libavcodec/aacpsy.c
   trunk/libavcodec/aactab.c
   trunk/libavcodec/aactab.h
   trunk/libavcodec/aandcttab.c
   trunk/libavcodec/aandcttab.h
   trunk/libavcodec/aasc.c
   trunk/libavcodec/ac3.c
   trunk/libavcodec/ac3.h
   trunk/libavcodec/ac3dec.h
   trunk/libavcodec/ac3dec_data.c
   trunk/libavcodec/ac3enc.c
   trunk/libavcodec/ac3tab.c
   trunk/libavcodec/adpcm.c
(Continue reading)

Permalink | Reply | 0 comments |
headers
diego | 1 Feb 2009 03:01
Picon

r28414 - trunk/libswscale/swscale.h

Author: diego
Date: Sun Feb  1 03:01:31 2009
New Revision: 28414

Log:
Use full internal pathname in doxygen  <at> file directives.
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.

Modified:
   trunk/libswscale/swscale.h

Modified: trunk/libswscale/swscale.h
==============================================================================
--- trunk/libswscale/swscale.h	Sun Feb  1 01:00:21 2009	(r28413)
+++ trunk/libswscale/swscale.h	Sun Feb  1 03:01:31 2009	(r28414)
 <at>  <at>  -22,7 +22,7  <at>  <at> 
 #define SWSCALE_SWSCALE_H

 /**
- *  <at> file swscale.h
+ *  <at> file libswscale/swscale.h
  *  <at> brief
  *     external api for the swscale stuff
  */
Permalink | Reply | 0 comments |
headers
rbultje | 1 Feb 2009 14:37
Picon

r16913 - trunk/libavformat/rtsp.c

Author: rbultje
Date: Sun Feb  1 14:37:45 2009
New Revision: 16913

Log:
Fix the Transport: line in the SETUP request so that it works with WMS
servers when trying to set up a session over TCP:
- add the interleave property
- add unicast, only for WMS (since it is normally only UDP, but WMS expects it
   for UDP and TCP)
- add mode=play
See discussion in "[PATCH] RTSP-MS 9/15: add interleave property to the TCP
transport line of the SETUP request" thread on mailinglist.

Modified:
   trunk/libavformat/rtsp.c

Modified: trunk/libavformat/rtsp.c
==============================================================================
--- trunk/libavformat/rtsp.c	Sun Feb  1 03:00:19 2009	(r16912)
+++ trunk/libavformat/rtsp.c	Sun Feb  1 14:37:45 2009	(r16913)
 <at>  <at>  -886,7 +886,7  <at>  <at>  make_setup_request (AVFormatContext *s, 
                     int lower_transport, const char *real_challenge)
 {
     RTSPState *rt = s->priv_data;
-    int j, i, err;
+    int j, i, err, interleave = 0;
     RTSPStream *rtsp_st;
     RTSPHeader reply1, *reply = &reply1;
     char cmd[2048];
(Continue reading)

Permalink | Reply | 0 comments |
headers
diego | 1 Feb 2009 15:07
Picon

r16914 - trunk/libavcodec/dsputil.c

Author: diego
Date: Sun Feb  1 15:07:08 2009
New Revision: 16914

Log:
Remove H.264 encoder initialization.
We have no H.264 encoder to speak of and this produces warnings.

Modified:
   trunk/libavcodec/dsputil.c

Modified: trunk/libavcodec/dsputil.c
==============================================================================
--- trunk/libavcodec/dsputil.c	Sun Feb  1 14:37:45 2009	(r16913)
+++ trunk/libavcodec/dsputil.c	Sun Feb  1 15:07:08 2009	(r16914)
 <at>  <at>  -4497,9 +4497,6  <at>  <at>  void dsputil_init(DSPContext* c, AVCodec
 #if CONFIG_WMV2_DECODER || CONFIG_VC1_DECODER || CONFIG_WMV3_DECODER
     ff_intrax8dsp_init(c,avctx);
 #endif
-#if CONFIG_H264_ENCODER
-    ff_h264dspenc_init(c,avctx);
-#endif
 #if CONFIG_RV30_DECODER
     ff_rv30dsp_init(c,avctx);
 #endif
Permalink | Reply | 0 comments |
headers
kostya | 1 Feb 2009 15:44
Picon

r16915 - in trunk/libavcodec: aasc.c bmp.c msrle.c tscc.c

Author: kostya
Date: Sun Feb  1 15:44:51 2009
New Revision: 16915

Log:
Silence useless compiler warning when passing AVFrame* instead of AVPicture*
to ff_msrle_decode()

Modified:
   trunk/libavcodec/aasc.c
   trunk/libavcodec/bmp.c
   trunk/libavcodec/msrle.c
   trunk/libavcodec/tscc.c

Modified: trunk/libavcodec/aasc.c
==============================================================================
--- trunk/libavcodec/aasc.c	Sun Feb  1 15:07:08 2009	(r16914)
+++ trunk/libavcodec/aasc.c	Sun Feb  1 15:44:51 2009	(r16915)
 <at>  <at>  -83,7 +83,7  <at>  <at>  static int aasc_decode_frame(AVCodecCont
         }
         break;
     case 1:
-        ff_msrle_decode(avctx, &s->frame, 8, buf - 4, buf_size + 4);
+        ff_msrle_decode(avctx, (AVPicture*)&s->frame, 8, buf - 4, buf_size + 4);
         break;
     default:
         av_log(avctx, AV_LOG_ERROR, "Unknown compression type %d\n", compr);

Modified: trunk/libavcodec/bmp.c
==============================================================================
(Continue reading)

Permalink | Reply | 0 comments |
headers
kostya | 1 Feb 2009 16:03
Picon

r16916 - trunk/libavcodec/rv34.c

Author: kostya
Date: Sun Feb  1 16:03:40 2009
New Revision: 16916

Log:
Silence two pointer assignment compiler warnings in rv34.c

Modified:
   trunk/libavcodec/rv34.c

Modified: trunk/libavcodec/rv34.c
==============================================================================
--- trunk/libavcodec/rv34.c	Sun Feb  1 15:44:51 2009	(r16915)
+++ trunk/libavcodec/rv34.c	Sun Feb  1 16:03:40 2009	(r16916)
 <at>  <at>  -223,7 +223,7  <at>  <at>  static int rv34_decode_cbp(GetBitContext
     int ones;
     static const int cbp_masks[3] = {0x100000, 0x010000, 0x110000};
     static const int shifts[4] = { 0, 2, 8, 10 };
-    int *curshift = shifts;
+    const int *curshift = shifts;
     int i, t, mask;

     code = get_vlc2(gb, vlc->cbppattern[table].table, 9, 2);
 <at>  <at>  -883,7 +883,7  <at>  <at>  static void rv34_pred_4x4_block(RV34DecC
     }
     if(!right && up){
         topleft = dst[-stride + 3] * 0x01010101;
-        prev = &topleft;
+        prev = (uint8_t*)&topleft;
     }
(Continue reading)

Permalink | Reply | 0 comments |
headers
kostya | 1 Feb 2009 16:20
Picon

r16917 - trunk/libavcodec/truemotion2.c

Author: kostya
Date: Sun Feb  1 16:20:20 2009
New Revision: 16917

Log:
Factorize stream reading in TM2 decoder

Modified:
   trunk/libavcodec/truemotion2.c

Modified: trunk/libavcodec/truemotion2.c
==============================================================================
--- trunk/libavcodec/truemotion2.c	Sun Feb  1 16:03:40 2009	(r16916)
+++ trunk/libavcodec/truemotion2.c	Sun Feb  1 16:20:20 2009	(r16917)
 <at>  <at>  -757,13 +757,17  <at>  <at>  static int tm2_decode_blocks(TM2Context 
     return keyframe;
 }

+static const int tm2_stream_order[TM2_NUM_STREAMS] = {
+    TM2_C_HI, TM2_C_LO, TM2_L_HI, TM2_L_LO, TM2_UPD, TM2_MOT, TM2_TYPE
+};
+
 static int decode_frame(AVCodecContext *avctx,
                         void *data, int *data_size,
                         const uint8_t *buf, int buf_size)
 {
     TM2Context * const l = avctx->priv_data;
     AVFrame * const p= (AVFrame*)&l->pic;
-    int skip, t;
+    int i, skip, t;
(Continue reading)

Permalink | Reply | 0 comments |
headers
kostya | 1 Feb 2009 16:27
Picon

r16918 - trunk/libavcodec/truemotion2.c

Author: kostya
Date: Sun Feb  1 16:27:44 2009
New Revision: 16918

Log:
Make TM2 decoder byteswap input into separate buffer instead of doing it in-place.

Modified:
   trunk/libavcodec/truemotion2.c

Modified: trunk/libavcodec/truemotion2.c
==============================================================================
--- trunk/libavcodec/truemotion2.c	Sun Feb  1 16:20:20 2009	(r16917)
+++ trunk/libavcodec/truemotion2.c	Sun Feb  1 16:27:44 2009	(r16918)
 <at>  <at>  -768,23 +768,33  <at>  <at>  static int decode_frame(AVCodecContext *
     TM2Context * const l = avctx->priv_data;
     AVFrame * const p= (AVFrame*)&l->pic;
     int i, skip, t;
+    uint8_t *swbuf;

+    swbuf = av_malloc(buf_size + FF_INPUT_BUFFER_PADDING_SIZE);
+    if(!swbuf){
+        av_log(avctx, AV_LOG_ERROR, "Cannot allocate temporary buffer\n");
+        return -1;
+    }
     p->reference = 1;
     p->buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
     if(avctx->reget_buffer(avctx, p) < 0){
         av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+        av_free(swbuf);
(Continue reading)

Permalink | Reply | 0 comments |

Gmane