1 Index: ../ffmpeg/libavcodec/4xm.c
2 ===================================================================
3 RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/4xm.c,v
4 retrieving revision 1.15
6 --- ../ffmpeg/libavcodec/4xm.c 24 Apr 2005 17:21:07 -0000 1.15
7 +++ ../ffmpeg/libavcodec/4xm.c 27 Nov 2005 16:54:10 -0000
10 #include "mpegvideo.h"
13 -//#include <assert.h>
15 #define BLOCK_TYPE_VLC_BITS 5
16 #define ACDC_VLC_BITS 9
18 Index: ../ffmpeg/libavcodec/asv1.c
19 ===================================================================
20 RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/asv1.c,v
21 retrieving revision 1.18
23 --- ../ffmpeg/libavcodec/asv1.c 7 May 2005 19:24:07 -0000 1.18
24 +++ ../ffmpeg/libavcodec/asv1.c 27 Nov 2005 16:54:10 -0000
27 #include "mpegvideo.h"
30 -//#include <assert.h>
33 #define ASV2_LEVEL_VLC_BITS 10
35 Index: ../ffmpeg/libavcodec/cabac.h
36 ===================================================================
37 RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/cabac.h,v
38 retrieving revision 1.11
39 diff -u -r1.11 cabac.h
40 --- ../ffmpeg/libavcodec/cabac.h 29 May 2005 18:18:13 -0000 1.11
41 +++ ../ffmpeg/libavcodec/cabac.h 27 Nov 2005 16:54:10 -0000
50 #define CABAC_MASK ((1<<CABAC_BITS)-1)
52 Index: ../ffmpeg/libavcodec/dv.c
53 ===================================================================
54 RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/dv.c,v
55 retrieving revision 1.65
57 --- ../ffmpeg/libavcodec/dv.c 2 Sep 2005 08:30:26 -0000 1.65
58 +++ ../ffmpeg/libavcodec/dv.c 27 Nov 2005 16:54:11 -0000
60 #include "simple_idct.h"
64 -//#include <assert.h>
66 typedef struct DVVideoContext {
69 Index: ../ffmpeg/libavcodec/dvdsubenc.c
70 ===================================================================
71 RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/dvdsubenc.c,v
72 retrieving revision 1.1
73 diff -u -r1.1 dvdsubenc.c
74 --- ../ffmpeg/libavcodec/dvdsubenc.c 14 Nov 2005 22:17:29 -0000 1.1
75 +++ ../ffmpeg/libavcodec/dvdsubenc.c 27 Nov 2005 16:54:11 -0000
83 typedef struct DVDSubtitleContext {
86 Index: ../ffmpeg/libavcodec/flac.c
87 ===================================================================
88 RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/flac.c,v
89 retrieving revision 1.19
91 --- ../ffmpeg/libavcodec/flac.c 5 Sep 2005 09:28:46 -0000 1.19
92 +++ ../ffmpeg/libavcodec/flac.c 27 Nov 2005 16:54:12 -0000
94 #include "bitstream.h"
100 #define MAX_CHANNELS 8
101 #define MAX_BLOCKSIZE 65535
102 #define FLAC_STREAMINFO_SIZE 34
103 Index: ../ffmpeg/libavcodec/h263.c
104 ===================================================================
105 RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/h263.c,v
106 retrieving revision 1.291
107 diff -u -r1.291 h263.c
108 --- ../ffmpeg/libavcodec/h263.c 19 Sep 2005 12:03:51 -0000 1.291
109 +++ ../ffmpeg/libavcodec/h263.c 27 Nov 2005 16:54:15 -0000
111 #include "h263data.h"
112 #include "mpeg4data.h"
115 -//#include <assert.h>
117 #define INTRA_MCBPC_VLC_BITS 6
118 #define INTER_MCBPC_VLC_BITS 7
119 #define CBPY_VLC_BITS 6
120 Index: ../ffmpeg/libavcodec/h264.c
121 ===================================================================
122 RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/h264.c,v
123 retrieving revision 1.166
124 diff -u -r1.166 h264.c
125 --- ../ffmpeg/libavcodec/h264.c 10 Nov 2005 04:40:49 -0000 1.166
126 +++ ../ffmpeg/libavcodec/h264.c 27 Nov 2005 16:54:20 -0000
134 #define interlaced_dct interlaced_dct_is_a_bad_name
135 #define mb_intra mb_intra_isnt_initalized_see_mb_type
137 Index: ../ffmpeg/libavcodec/mdec.c
138 ===================================================================
139 RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mdec.c,v
140 retrieving revision 1.15
141 diff -u -r1.15 mdec.c
142 --- ../ffmpeg/libavcodec/mdec.c 13 Aug 2005 21:34:24 -0000 1.15
143 +++ ../ffmpeg/libavcodec/mdec.c 27 Nov 2005 16:54:21 -0000
146 #include "mpegvideo.h"
149 -//#include <assert.h>
151 typedef struct MDECContext{
152 AVCodecContext *avctx;
154 Index: ../ffmpeg/libavcodec/mjpeg.c
155 ===================================================================
156 RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mjpeg.c,v
157 retrieving revision 1.114
158 diff -u -r1.114 mjpeg.c
159 --- ../ffmpeg/libavcodec/mjpeg.c 18 Sep 2005 21:21:01 -0000 1.114
160 +++ ../ffmpeg/libavcodec/mjpeg.c 27 Nov 2005 16:54:22 -0000
162 * MJPEG encoder and decoder.
170 #include "mpegvideo.h"
171 Index: ../ffmpeg/libavcodec/motion_est.c
172 ===================================================================
173 RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/motion_est.c,v
174 retrieving revision 1.110
175 diff -u -r1.110 motion_est.c
176 --- ../ffmpeg/libavcodec/motion_est.c 26 Aug 2005 19:05:44 -0000 1.110
177 +++ ../ffmpeg/libavcodec/motion_est.c 27 Nov 2005 16:54:23 -0000
180 #include "mpegvideo.h"
185 #define SQ(a) ((a)*(a))
188 Index: ../ffmpeg/libavcodec/mpeg12.c
189 ===================================================================
190 RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mpeg12.c,v
191 retrieving revision 1.243
192 diff -u -r1.243 mpeg12.c
193 --- ../ffmpeg/libavcodec/mpeg12.c 20 Nov 2005 23:09:05 -0000 1.243
194 +++ ../ffmpeg/libavcodec/mpeg12.c 27 Nov 2005 16:54:25 -0000
197 #include "mpeg12data.h"
200 -//#include <assert.h>
204 #define SEQ_END_CODE 0x000001b7
205 Index: ../ffmpeg/libavcodec/mpegvideo.c
206 ===================================================================
207 RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mpegvideo.c,v
208 retrieving revision 1.489
209 diff -u -r1.489 mpegvideo.c
210 --- ../ffmpeg/libavcodec/mpegvideo.c 5 Nov 2005 00:16:03 -0000 1.489
211 +++ ../ffmpeg/libavcodec/mpegvideo.c 27 Nov 2005 16:54:29 -0000
213 #include "fastmemcpy.h"
217 -//#include <assert.h>
219 #ifdef CONFIG_ENCODERS
220 static void encode_picture(MpegEncContext *s, int picture_number);
221 #endif //CONFIG_ENCODERS
222 Index: ../ffmpeg/libavcodec/oggvorbis.c
223 ===================================================================
224 RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/oggvorbis.c,v
225 retrieving revision 1.24
226 diff -u -r1.24 oggvorbis.c
227 --- ../ffmpeg/libavcodec/oggvorbis.c 21 Sep 2005 23:09:16 -0000 1.24
228 +++ ../ffmpeg/libavcodec/oggvorbis.c 27 Nov 2005 16:54:29 -0000
236 #define OGGVORBIS_FRAME_SIZE 64
238 #define BUFFER_SIZE (1024*64)
239 Index: ../ffmpeg/libavcodec/qdm2.c
240 ===================================================================
241 RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/qdm2.c,v
242 retrieving revision 1.2
244 --- ../ffmpeg/libavcodec/qdm2.c 19 Oct 2005 22:27:34 -0000 1.2
245 +++ ../ffmpeg/libavcodec/qdm2.c 27 Nov 2005 16:54:31 -0000
248 #include "qdm2data.h"
254 #define SOFTCLIP_THRESHOLD 27600
255 #define HARDCLIP_THRESHOLD 35716
256 Index: ../ffmpeg/libavcodec/ratecontrol.c
257 ===================================================================
258 RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/ratecontrol.c,v
259 retrieving revision 1.49
260 diff -u -r1.49 ratecontrol.c
261 --- ../ffmpeg/libavcodec/ratecontrol.c 30 Apr 2005 21:43:57 -0000 1.49
262 +++ ../ffmpeg/libavcodec/ratecontrol.c 27 Nov 2005 16:54:32 -0000
265 #include "mpegvideo.h"
267 -#undef NDEBUG // allways check asserts, the speed effect is far too small to disable them
271 #define M_E 2.718281828
273 Index: ../ffmpeg/libavcodec/shorten.c
274 ===================================================================
275 RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/shorten.c,v
276 retrieving revision 1.1
277 diff -u -r1.1 shorten.c
278 --- ../ffmpeg/libavcodec/shorten.c 26 Feb 2005 03:36:03 -0000 1.1
279 +++ ../ffmpeg/libavcodec/shorten.c 27 Nov 2005 16:54:32 -0000
287 #include "bitstream.h"
291 av_log(s->avctx, AV_LOG_ERROR, "unknown audio type");
296 for (chan = 0; chan < s->channels; chan++)
297 Index: ../ffmpeg/libavcodec/snow.c
298 ===================================================================
299 RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/snow.c,v
300 retrieving revision 1.63
301 diff -u -r1.63 snow.c
302 --- ../ffmpeg/libavcodec/snow.c 21 Sep 2005 23:09:16 -0000 1.63
303 +++ ../ffmpeg/libavcodec/snow.c 27 Nov 2005 16:54:38 -0000
306 #include "mpegvideo.h"
311 #define MAX_DECOMPOSITIONS 8
314 Index: ../ffmpeg/libavcodec/svq1.c
315 ===================================================================
316 RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/svq1.c,v
317 retrieving revision 1.58
318 diff -u -r1.58 svq1.c
319 --- ../ffmpeg/libavcodec/svq1.c 5 Sep 2005 10:26:10 -0000 1.58
320 +++ ../ffmpeg/libavcodec/svq1.c 27 Nov 2005 16:54:38 -0000
322 #include "mpegvideo.h"
328 extern const uint8_t mvtab[33][2];
330 static VLC svq1_block_type;
331 Index: ../ffmpeg/libavcodec/vc9.c
332 ===================================================================
333 RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/vc9.c,v
334 retrieving revision 1.24
336 --- ../ffmpeg/libavcodec/vc9.c 21 Sep 2005 23:09:16 -0000 1.24
337 +++ ../ffmpeg/libavcodec/vc9.c 27 Nov 2005 16:54:38 -0000
339 #include "mpegvideo.h"
345 extern const uint32_t ff_table0_dc_lum[120][2], ff_table1_dc_lum[120][2];
346 extern const uint32_t ff_table0_dc_chroma[120][2], ff_table1_dc_chroma[120][2];
347 extern VLC ff_msmp4_dc_luma_vlc[2], ff_msmp4_dc_chroma_vlc[2];
348 Index: ../ffmpeg/libavcodec/vcr1.c
349 ===================================================================
350 RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/vcr1.c,v
351 retrieving revision 1.8
353 --- ../ffmpeg/libavcodec/vcr1.c 24 Feb 2005 19:08:50 -0000 1.8
354 +++ ../ffmpeg/libavcodec/vcr1.c 27 Nov 2005 16:54:38 -0000
357 #include "mpegvideo.h"
360 -//#include <assert.h>
362 typedef struct VCR1Context{
363 AVCodecContext *avctx;
365 Index: ../ffmpeg/libavcodec/vorbis.c
366 ===================================================================
367 RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/vorbis.c,v
368 retrieving revision 1.11
369 diff -u -r1.11 vorbis.c
370 --- ../ffmpeg/libavcodec/vorbis.c 30 May 2005 22:02:00 -0000 1.11
371 +++ ../ffmpeg/libavcodec/vorbis.c 27 Nov 2005 16:54:44 -0000
373 #define AV_DEBUG(...)
379 /* Helper functions */
382 Index: ../ffmpeg/libavcodec/xvmcvideo.c
383 ===================================================================
384 RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/xvmcvideo.c,v
385 retrieving revision 1.11
386 diff -u -r1.11 xvmcvideo.c
387 --- ../ffmpeg/libavcodec/xvmcvideo.c 24 Apr 2005 17:21:10 -0000 1.11
388 +++ ../ffmpeg/libavcodec/xvmcvideo.c 27 Nov 2005 16:54:44 -0000
391 #include "mpegvideo.h"
396 #ifdef USE_FASTMEMCPY
397 #include "fastmemcpy.h"
399 Index: ../ffmpeg/libavformat/Makefile
400 ===================================================================
401 RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/Makefile,v
402 retrieving revision 1.102
403 retrieving revision 1.111
404 diff -u -r1.111 Makefile
405 --- Makefile 26 Jan 2006 23:42:29 -0000 1.111
406 +++ Makefile 28 Jan 2006 21:44:10 -0000
411 -OBJS+=mpeg.o mpegts.o mpegtsenc.o ffm.o crc.o img.o img2.o raw.o rm.o \
412 - avienc.o avidec.o wav.o mmf.o swf.o au.o gif.o mov.o mpjpeg.o dv.o \
413 +OBJS+=mpeg.o mpegts.o ffm.o img.o img2.o raw.o rm.o \
414 + avidec.o wav.o mmf.o swf.o au.o gif.o mov.o mpjpeg.o dv.o \
415 yuv4mpeg.o 4xm.o flvdec.o psxstr.o idroq.o ipmovie.o \
416 nut.o wc3movie.o mp3.o westwood.o segafilm.o idcin.o flic.o \
417 sierravmd.o matroska.o sol.o electronicarts.o nsvdec.o asf.o \
421 ifeq ($(CONFIG_MUXERS),yes)
422 -OBJS+= flvenc.o movenc.o asf-enc.o adtsenc.o
423 +OBJS+= mpegtsenc.o crc.o avienc.o flvenc.o movenc.o asf-enc.o adtsenc.o
431 +ifeq ($(CONFIG_FFSERVER),yes)
436 OBJS+= avio.o aviobuf.o
438 Index: ../ffmpeg/libavformat/allformats.c
439 ===================================================================
440 RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/allformats.c,v
441 retrieving revision 1.53
442 diff -u -r1.53 allformats.c
443 --- allformats.c 21 Jan 2006 18:36:32 -0000 1.53
444 +++ allformats.c 28 Jan 2006 21:57:13 -0000
449 +#if defined(CONFIG_FFSERVER)
453 #if defined(CONFIG_VIDEO4LINUX2)
456 Index: ../ffmpeg/libavformat/asf-enc.c
457 ===================================================================
458 RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/asf-enc.c,v
459 retrieving revision 1.73
460 diff -u -r1.73 asf-enc.c
461 --- ../ffmpeg/libavformat/asf-enc.c 23 Sep 2005 00:25:41 -0000 1.73
462 +++ ../ffmpeg/libavformat/asf-enc.c 27 Nov 2005 16:54:47 -0000
473 Index: ../ffmpeg/libavformat/asf.c
474 ===================================================================
475 RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/asf.c,v
476 retrieving revision 1.86
478 --- ../ffmpeg/libavformat/asf.c 26 Oct 2005 12:15:09 -0000 1.86
479 +++ ../ffmpeg/libavformat/asf.c 27 Nov 2005 16:54:50 -0000
481 #include "mpegaudio.h"
487 #define FRAME_HEADER_SIZE 17
488 // Fix Me! FRAME_HEADER_SIZE may be different.
490 Index: ../ffmpeg/libavformat/avidec.c
491 ===================================================================
492 RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/avidec.c,v
493 retrieving revision 1.76
494 diff -u -r1.76 avidec.c
495 --- ../ffmpeg/libavformat/avidec.c 6 Sep 2005 21:25:35 -0000 1.76
496 +++ ../ffmpeg/libavformat/avidec.c 27 Nov 2005 16:54:50 -0000
508 Index: ../ffmpeg/libavformat/flvenc.c
509 ===================================================================
510 RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/flvenc.c,v
511 retrieving revision 1.19
512 diff -u -r1.19 flvenc.c
513 --- ../ffmpeg/libavformat/flvenc.c 12 Nov 2005 20:01:23 -0000 1.19
514 +++ ../ffmpeg/libavformat/flvenc.c 27 Nov 2005 16:54:50 -0000
517 #include "avformat.h"
522 typedef struct FLVContext {
525 Index: ../ffmpeg/libavformat/movenc.c
526 ===================================================================
527 RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/movenc.c,v
528 retrieving revision 1.44
529 diff -u -r1.44 movenc.c
530 --- ../ffmpeg/libavformat/movenc.c 6 Sep 2005 21:25:35 -0000 1.44
531 +++ ../ffmpeg/libavformat/movenc.c 27 Nov 2005 16:54:56 -0000
539 #define MOV_INDEX_CLUSTER_SIZE 16384
540 #define globalTimescale 1000
542 Index: ../ffmpeg/libavformat/mpeg.c
543 ===================================================================
544 RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/mpeg.c,v
545 retrieving revision 1.89
546 diff -u -r1.89 mpeg.c
547 --- ../ffmpeg/libavformat/mpeg.c 23 Sep 2005 00:25:41 -0000 1.89
548 +++ ../ffmpeg/libavformat/mpeg.c 27 Nov 2005 16:54:58 -0000
550 #define MAX_PAYLOAD_SIZE 4096
556 typedef struct PacketDesc {
559 Index: ../ffmpeg/libavformat/nut.c
560 ===================================================================
561 RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/nut.c,v
562 retrieving revision 1.56
564 --- ../ffmpeg/libavformat/nut.c 23 Sep 2005 00:25:41 -0000 1.56
565 +++ ../ffmpeg/libavformat/nut.c 27 Nov 2005 16:55:00 -0000
567 #include "mpegaudio.h"
576 Index: ../ffmpeg/libavformat/ogg.c
577 ===================================================================
578 RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/ogg.c,v
579 retrieving revision 1.26
581 --- ../ffmpeg/libavformat/ogg.c 23 Sep 2005 00:25:41 -0000 1.26
582 +++ ../ffmpeg/libavformat/ogg.c 27 Nov 2005 16:55:00 -0000
585 #include "avformat.h"
590 #define DECODER_BUFFER_SIZE 4096
593 Index: ../ffmpeg/libavformat/swf.c
594 ===================================================================
595 RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/swf.c,v
596 retrieving revision 1.29
598 --- ../ffmpeg/libavformat/swf.c 23 Sep 2005 00:25:41 -0000 1.29
599 +++ ../ffmpeg/libavformat/swf.c 27 Nov 2005 16:55:00 -0000
609 offset_t duration_pos;
610 Index: ../ffmpeg/libavformat/utils.c
611 ===================================================================
612 RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/utils.c,v
613 retrieving revision 1.168
614 diff -u -r1.168 utils.c
615 --- ../ffmpeg/libavformat/utils.c 4 Nov 2005 23:50:11 -0000 1.168
616 +++ ../ffmpeg/libavformat/utils.c 27 Nov 2005 16:55:02 -0000
619 #include "avformat.h"
625 * @file libavformat/utils.c
626 * Various utility functions for using ffmpeg library.