|
[-]
[+]
|
Changed |
ffmpeg.spec
|
|
|
|
[-]
[+]
|
Changed |
ffmpeg_configure.diff
^
|
| @@ -1,5 +1,5 @@
---- configure.save 2008-06-07 21:06:08.000000000 +0200
-+++ configure 2008-06-07 21:07:08.000000000 +0200
+--- configure.orig 2008-06-15 21:30:34.000000000 +0200
++++ configure 2008-06-15 21:38:50.000000000 +0200
@@ -1590,11 +1590,11 @@
# ---
# check availability of some header files
@@ -35,7 +35,7 @@
Libs: -L\${libdir} -l${shortname} $(disabled shared && echo $libs)
Libs.private: $(enabled shared && echo $libs)
-Cflags: -I\${includedir}
-+Cflags: -I\${includedir} -I\${includedir}/$name
++Cflags: -I/usr/include -I/usr/include/$name
EOF
cat <<EOF > $name-uninstalled.pc
prefix=
@@ -44,7 +44,7 @@
Conflicts:
Libs: \${libdir}/${LIBPREF}${shortname}${LIBSUF} $libs
-Cflags: -I\${includedir}
-+Cflags: -I\${includedir} -I\${includedir}/$name
++Cflags: -I/usr/include -I/usr/include/$name
EOF
}
|
|
[-]
[+]
|
Added |
ffmpeg_fix_wmadecoding.diff
^
|
| @@ -0,0 +1,88 @@
+--- libavcodec/wmadec.c.orig 2008-07-21 12:24:00.000000000 +0200
++++ libavcodec/wmadec.c 2008-06-15 21:30:33.000000000 +0200
+@@ -401,14 +401,13 @@
+ s->channel_coded[ch] = a;
+ v |= a;
+ }
+-
+- bsize = s->frame_len_bits - s->block_len_bits;
+-
+ /* if no channel coded, no need to go further */
+ /* XXX: fix potential framing problems */
+ if (!v)
+ goto next;
+
++ bsize = s->frame_len_bits - s->block_len_bits;
++
+ /* read total gain and extract corresponding number of bits for
+ coef escape coding */
+ total_gain = 1;
+@@ -680,29 +679,27 @@
+ }
+ }
+
+-next:
+ for(ch = 0; ch < s->nb_channels; ch++) {
+- int n4, index, n;
++ if (s->channel_coded[ch]) {
++ int n4, index, n;
+
+- n = s->block_len;
+- n4 = s->block_len / 2;
+- if(s->channel_coded[ch]){
++ n = s->block_len;
++ n4 = s->block_len / 2;
+ s->mdct_ctx[bsize].fft.imdct_calc(&s->mdct_ctx[bsize],
+- s->output, s->coefs[ch], s->mdct_tmp);
+- }else
+- memset(s->output, 0, sizeof(s->output));
+-
+- /* multiply by the window and add in the frame */
+- index = (s->frame_len / 2) + s->block_pos - n4;
+- wma_window(s, &s->frame_out[ch][index]);
+-
+- /* specific fast case for ms-stereo : add to second
+- channel if it is not coded */
+- if (s->ms_stereo && !s->channel_coded[1]) {
+- wma_window(s, &s->frame_out[1][index]);
++ s->output, s->coefs[ch], s->mdct_tmp);
++
++ /* multiply by the window and add in the frame */
++ index = (s->frame_len / 2) + s->block_pos - n4;
++ wma_window(s, &s->frame_out[ch][index]);
++
++ /* specific fast case for ms-stereo : add to second
++ channel if it is not coded */
++ if (s->ms_stereo && !s->channel_coded[1]) {
++ wma_window(s, &s->frame_out[1][index]);
++ }
+ }
+ }
+-
++ next:
+ /* update block number */
+ s->block_num++;
+ s->block_pos += s->block_len;
+@@ -784,11 +781,6 @@
+ skip_bits(&s->gb, 4); /* super frame index */
+ nb_frames = get_bits(&s->gb, 4) - 1;
+
+- if((nb_frames+1) * s->nb_channels * s->frame_len * sizeof(int16_t) > *data_size){
+- av_log(s->avctx, AV_LOG_ERROR, "Insufficient output space\n");
+- goto fail;
+- }
+-
+ bit_offset = get_bits(&s->gb, s->byte_offset_bits + 3);
+
+ if (s->last_superframe_len > 0) {
+@@ -844,10 +836,6 @@
+ s->last_superframe_len = len;
+ memcpy(s->last_superframe, buf + pos, len);
+ } else {
+- if(s->nb_channels * s->frame_len * sizeof(int16_t) > *data_size){
+- av_log(s->avctx, AV_LOG_ERROR, "Insufficient output space\n");
+- goto fail;
+- }
+ /* single frame decode */
+ if (wma_decode_frame(s, samples) < 0)
+ goto fail;
|
|
|
Deleted |
ffmpeg-0.4.9-svn20080512.tar.bz2
^
|
|
|
Deleted |
ffmpeg-0.4.9-svn20080607.tar.bz2
^
|
|
|
Deleted |
ffmpeg-0.4.9-svn20080612.tar.bz2
^
|
|
|
Added |
ffmpeg-0.4.9svn-20080724.tar.bz2
^
|
