headers
diego | 1 Oct 2008 02:47
Picon

[ffmpeg.org]: r197 - trunk/src/legal

Author: diego
Date: Wed Oct  1 02:47:40 2008
New Revision: 197

Log:
Clarify that FFmpeg is licensed as LGPLv2.1 or later or GPLv2 or later
depending on which modules have been compiled in.

Modified:
   trunk/src/legal

Modified: trunk/src/legal
==============================================================================
--- trunk/src/legal	(original)
+++ trunk/src/legal	Wed Oct  1 02:47:40 2008
 <at>  <at>  -14,12 +14,13  <at>  <at> 

 <h2>FFmpeg License</h2>

-FFmpeg is licensed under the <a href="http://www.gnu.org/copyleft/lesser.html">
-GNU Lesser General Public License (LGPL)</a>.  However, FFmpeg
-incorporates several optional modules that are covered by the
-<a href="http://www.gnu.org/copyleft/gpl.html">GNU General Public License
-(GPL)</a>, notably libpostproc and libswscale.  If those parts
-get used the GPL applies to all of FFmpeg.
+FFmpeg is licensed under the
+<a href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html">GNU Lesser
+General Public License (LGPL) version 2.1</a> or later.
+However, FFmpeg incorporates several optional modules that are covered by the
+<a href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GNU General
(Continue reading)

Permalink | Reply | 0 comments |
headers
benoit | 1 Oct 2008 09:28
Picon

r15493 - trunk/libavcodec/vorbis_dec.c

Author: benoit
Date: Wed Oct  1 09:28:34 2008
New Revision: 15493

Log:
Interleaved forward/backward channels processing in order to increase chances
of stepping on already cached data for the cores with extremely small data
cache.
Patch by Siarhei Siamashka: name dot surname at gmail

Modified:
   trunk/libavcodec/vorbis_dec.c

Modified: trunk/libavcodec/vorbis_dec.c
==============================================================================
--- trunk/libavcodec/vorbis_dec.c	(original)
+++ trunk/libavcodec/vorbis_dec.c	Wed Oct  1 09:28:34 2008
 <at>  <at>  -1426,7 +1426,7  <at>  <at>  static int vorbis_parse_audio_packet(vor
     uint_fast8_t mode_number;
     uint_fast8_t blockflag;
     uint_fast16_t blocksize;
-    int_fast32_t i,j,dir;
+    int_fast32_t i,j;
     uint_fast8_t no_residue[vc->audio_channels];
     uint_fast8_t do_not_decode[vc->audio_channels];
     vorbis_mapping *mapping;
 <at>  <at>  -1518,29 +1518,27  <at>  <at>  static int vorbis_parse_audio_packet(vor
         vc->dsp.vorbis_inverse_coupling(mag, ang, blocksize/2);
     }
(Continue reading)

Permalink | Reply | 0 comments |
headers
benoit | 1 Oct 2008 10:27
Picon

r15494 - trunk/libavcodec/indeo3.c

Author: benoit
Date: Wed Oct  1 10:27:37 2008
New Revision: 15494

Log:
Merge declaration and assignment.

Modified:
   trunk/libavcodec/indeo3.c

Modified: trunk/libavcodec/indeo3.c
==============================================================================
--- trunk/libavcodec/indeo3.c	(original)
+++ trunk/libavcodec/indeo3.c	Wed Oct  1 10:27:37 2008
 <at>  <at>  -98,19 +98,15  <at>  <at>  static av_cold int build_modpred(Indeo3D

 static av_cold int iv_alloc_frames(Indeo3DecodeContext *s)
 {
-    int luma_width, luma_height, luma_pixels, chroma_width, chroma_height,
-        chroma_pixels, i;
-    unsigned int bufsize;
-
-    luma_width   = (s->width  + 3) & (~3);
-    luma_height  = (s->height + 3) & (~3);
-    chroma_width  = ((luma_width >> 2) + 3) & (~3);
-    chroma_height = ((luma_height>> 2) + 3) & (~3);
-    luma_pixels = luma_width * luma_height;
-    chroma_pixels = chroma_width * chroma_height;
-
-    bufsize = luma_pixels * 2 + luma_width * 3 +
(Continue reading)

Permalink | Reply | 0 comments |
headers
benoit | 1 Oct 2008 10:29
Picon

r15495 - trunk/libavcodec/indeo3.c

Author: benoit
Date: Wed Oct  1 10:29:19 2008
New Revision: 15495

Log:
Remove useless context variable.

Modified:
   trunk/libavcodec/indeo3.c

Modified: trunk/libavcodec/indeo3.c
==============================================================================
--- trunk/libavcodec/indeo3.c	(original)
+++ trunk/libavcodec/indeo3.c	Wed Oct  1 10:29:19 2008
 <at>  <at>  -35,7 +35,6  <at>  <at>  typedef struct
     uint8_t *Ybuf;
     uint8_t *Ubuf;
     uint8_t *Vbuf;
-    unsigned int the_buf_size;
     unsigned short y_w, y_h;
     unsigned short uv_w, uv_h;
 } YUVBufs;
 <at>  <at>  -114,7 +113,6  <at>  <at>  static av_cold int iv_alloc_frames(Indeo
     s->iv_frame[0].y_h = s->iv_frame[1].y_h = luma_height;
     s->iv_frame[0].uv_w = s->iv_frame[1].uv_w = chroma_width;
     s->iv_frame[0].uv_h = s->iv_frame[1].uv_h = chroma_height;
-    s->iv_frame[0].the_buf_size = bufsize;

     s->iv_frame[0].Ybuf = s->buf + luma_width;
     i = luma_pixels + luma_width * 2;
(Continue reading)

Permalink | Reply | 0 comments |
headers
rbultje | 1 Oct 2008 14:37
Picon

r15496 - in trunk/libavformat: rdt.c rdt.h rtsp.c

Author: rbultje
Date: Wed Oct  1 14:37:07 2008
New Revision: 15496

Log:
This patch refactors RDT packet header parsing so that it can be used in
rtsp.c to detect the ID of the packet source also in case of TCP streams.
This allows proper playback of RDT streams with multiple stream types, e.g.
audio + video. Accepted by LucaB in "RDT/Realmedia patches #2" thread on ML.

Modified:
   trunk/libavformat/rdt.c
   trunk/libavformat/rdt.h
   trunk/libavformat/rtsp.c

Modified: trunk/libavformat/rdt.c
==============================================================================
--- trunk/libavformat/rdt.c	(original)
+++ trunk/libavformat/rdt.c	Wed Oct  1 14:37:07 2008
 <at>  <at>  -140,27 +140,25  <at>  <at>  rdt_load_mdpr (rdt_data *rdt, AVStream *
  * Actual data handling.
  */

-static int rdt_parse_header(struct RTPDemuxContext *s, const uint8_t *buf,
-                            int len, int *seq, uint32_t *timestamp, int *flags)
+int
+ff_rdt_parse_header(const uint8_t *buf, int len,
+                    int *sn, int *seq, int *rn, uint32_t *ts)
 {
-    rdt_data *rdt = s->dynamic_protocol_context;
(Continue reading)

Permalink | Reply | 0 comments |
headers
rbultje | 1 Oct 2008 14:38
Picon

r15497 - trunk/libavformat/rdt.c

Author: rbultje
Date: Wed Oct  1 14:38:41 2008
New Revision: 15497

Log:
Use parse_packet vfunc in RTPDynamicProtocolHandler instead of hardcoding
the use of rdt_parse_packet(). See "RDT/Realmedia patches #2" thread on ML.

Modified:
   trunk/libavformat/rdt.c

Modified: trunk/libavformat/rdt.c
==============================================================================
--- trunk/libavformat/rdt.c	(original)
+++ trunk/libavformat/rdt.c	Wed Oct  1 14:38:41 2008
 <at>  <at>  -211,10 +211,13  <at>  <at>  ff_rdt_parse_packet(RTPDemuxContext *s, 
     uint32_t timestamp;
     int rv= 0;

+    if (!s->parse_packet)
+        return -1;
+
     if (!buf) {
         /* return the next packets, if any */
         timestamp= 0; ///< Should not be used if buf is NULL, but should be set to the timestamp of the packet returned....
-        rv= rdt_parse_packet(s, pkt, &timestamp, NULL, 0, flags);
+        rv= s->parse_packet(s, pkt, &timestamp, NULL, 0, flags);
         return rv;
     }
(Continue reading)

Permalink | Reply | 0 comments |
headers
benoit | 1 Oct 2008 14:48
Picon

r15498 - trunk/libavcodec/indeo3.c

Author: benoit
Date: Wed Oct  1 14:48:26 2008
New Revision: 15498

Log:
Fix indentation.

Modified:
   trunk/libavcodec/indeo3.c

Modified: trunk/libavcodec/indeo3.c
==============================================================================
--- trunk/libavcodec/indeo3.c	(original)
+++ trunk/libavcodec/indeo3.c	Wed Oct  1 14:48:26 2008
 <at>  <at>  -380,13 +380,13  <at>  <at>  static void iv_Decode_Chunk(Indeo3Decode
                                 if(lp2 == 0) {
                                     RLE_V3_CHECK(buf1,rle_v1,rle_v2,rle_v3)

-                                        if(rle_v1 == 1 || ref_vectors != NULL) {
-                                            for(i = 0, j = 0; i < 4; i++, j += width_tbl[1])
-                                                cur_lp[j] = ref_lp[j];
-                                        }
+                                    if(rle_v1 == 1 || ref_vectors != NULL) {
+                                        for(i = 0, j = 0; i < 4; i++, j += width_tbl[1])
+                                            cur_lp[j] = ref_lp[j];
+                                    }

                                     RLE_V2_CHECK(buf1,rle_v2, rle_v3,lp2)
-                                        break;
+                                    break;
(Continue reading)

Permalink | Reply | 0 comments |
headers
conrad | 1 Oct 2008 16:40
Picon

r15499 - in trunk/libavcodec: vp3.c vp3data.h

Author: conrad
Date: Wed Oct  1 16:40:29 2008
New Revision: 15499

Log:
filter_limit_values only needs 7 bits, make its tables smaller

Modified:
   trunk/libavcodec/vp3.c
   trunk/libavcodec/vp3data.h

Modified: trunk/libavcodec/vp3.c
==============================================================================
--- trunk/libavcodec/vp3.c	(original)
+++ trunk/libavcodec/vp3.c	Wed Oct  1 16:40:29 2008
 <at>  <at>  -230,7 +230,7  <at>  <at>  typedef struct Vp3DecodeContext {
     int huff_code_size;
     uint16_t huffman_table[80][32][2];

-    uint32_t filter_limit_values[64];
+    uint8_t filter_limit_values[64];
     int bounding_values_array[256];
 } Vp3DecodeContext;

Modified: trunk/libavcodec/vp3data.h
==============================================================================
--- trunk/libavcodec/vp3data.h	(original)
+++ trunk/libavcodec/vp3data.h	Wed Oct  1 16:40:29 2008
 <at>  <at>  -84,7 +84,7  <at>  <at>  static const uint32_t vp31_ac_scale_fact
    21,   19,   18,   17,   15,   13,  12,  10
(Continue reading)

Permalink | Reply | 0 comments |
headers
conrad | 1 Oct 2008 16:43
Picon

r15500 - in trunk: libavcodec/vp3.c libavformat/oggparsetheora.c

Author: conrad
Date: Wed Oct  1 16:43:08 2008
New Revision: 15500

Log:
Visible width/height fields were added in Theora 3.2

Modified:
   trunk/libavcodec/vp3.c
   trunk/libavformat/oggparsetheora.c

Modified: trunk/libavcodec/vp3.c
==============================================================================
--- trunk/libavcodec/vp3.c	(original)
+++ trunk/libavcodec/vp3.c	Wed Oct  1 16:43:08 2008
 <at>  <at>  -2078,8 +2078,8  <at>  <at>  static int theora_decode_header(AVCodecC
         av_log(avctx, AV_LOG_DEBUG, "Old (<alpha3) Theora bitstream, flipped image\n");
     }

-    s->width = get_bits(gb, 16) << 4;
-    s->height = get_bits(gb, 16) << 4;
+    visible_width  = s->width  = get_bits(gb, 16) << 4;
+    visible_height = s->height = get_bits(gb, 16) << 4;

     if(avcodec_check_dimensions(avctx, s->width, s->height)){
         av_log(avctx, AV_LOG_ERROR, "Invalid dimensions (%dx%d)\n", s->width, s->height);
 <at>  <at>  -2096,10 +2096,10  <at>  <at>  static int theora_decode_header(AVCodecC
         skip_bits(gb, 32); /* total number of macroblocks in a frame */
     }
(Continue reading)

Permalink | Reply | 0 comments |
headers
conrad | 1 Oct 2008 16:44
Picon

r15501 - in trunk: libavcodec/vp3.c libavformat/oggparsetheora.c

Author: conrad
Date: Wed Oct  1 16:44:30 2008
New Revision: 15501

Log:
Cosmetics: indentation

Modified:
   trunk/libavcodec/vp3.c
   trunk/libavformat/oggparsetheora.c

Modified: trunk/libavcodec/vp3.c
==============================================================================
--- trunk/libavcodec/vp3.c	(original)
+++ trunk/libavcodec/vp3.c	Wed Oct  1 16:44:30 2008
 <at>  <at>  -2097,8 +2097,8  <at>  <at>  static int theora_decode_header(AVCodecC
     }

     if (s->theora >= 0x030200) {
-    visible_width  = get_bits_long(gb, 24);
-    visible_height = get_bits_long(gb, 24);
+        visible_width  = get_bits_long(gb, 24);
+        visible_height = get_bits_long(gb, 24);

         skip_bits(gb, 8); /* offset x */
         skip_bits(gb, 8); /* offset y */

Modified: trunk/libavformat/oggparsetheora.c
==============================================================================
--- trunk/libavformat/oggparsetheora.c	(original)
(Continue reading)

Permalink | Reply | 0 comments |

Gmane