diff options
| author | Sebastien Vincent <seb@jitsi.org> | 2010-10-29 10:13:46 +0000 |
|---|---|---|
| committer | Sebastien Vincent <seb@jitsi.org> | 2010-10-29 10:13:46 +0000 |
| commit | a5dadec39185f6ff50c7e5edcfcd8b2e167e69cf (patch) | |
| tree | 9111d014c588bb2b9c108cd8954f37def4bc716d /src/native | |
| parent | c14ffbdffb0cc8ec3cf339c1c0ff84c8114a10d4 (diff) | |
| download | jitsi-a5dadec39185f6ff50c7e5edcfcd8b2e167e69cf.zip jitsi-a5dadec39185f6ff50c7e5edcfcd8b2e167e69cf.tar.gz jitsi-a5dadec39185f6ff50c7e5edcfcd8b2e167e69cf.tar.bz2 | |
Add H263+ video codec.
Diffstat (limited to 'src/native')
| -rw-r--r-- | src/native/ffmpeg/README | 11 | ||||
| -rw-r--r-- | src/native/ffmpeg/ffmpeg-23181.diff | 22 |
2 files changed, 32 insertions, 1 deletions
diff --git a/src/native/ffmpeg/README b/src/native/ffmpeg/README index 43f0d8c..14406bc 100644 --- a/src/native/ffmpeg/README +++ b/src/native/ffmpeg/README @@ -51,6 +51,8 @@ patch -p0 < ffmpeg-23181.diff --disable-network \ --enable-libx264 --enable-gpl --enable-parser=h264 --enable-encoder=libx264 \ --enable-decoder=h264 --enable-muxer=h264 --enable-demuxer=h264 \ + --enable-parser=h263 --enable-encoder=h263p \ + --enable-decoder=h263 --enable-muxer=h263 --enable-demuxer=h263 \ --enable-libmp3lame --enable-encoder=libmp3lame \ --extra-ldflags="-L$MP3LAME_HOME/libmp3lame/.libs -L$X264_HOME" --extra-cflags="-I$MP3LAME_HOME/include -I$X264_HOME" \ --disable-debug \ @@ -72,6 +74,8 @@ Then run: --disable-network \ --enable-libx264 --enable-gpl --enable-parser=h264 --enable-encoder=libx264 \ --enable-decoder=h264 --enable-muxer=h264 --enable-demuxer=h264 \ + --enable-parser=h263 --enable-encoder=h263p \ + --enable-decoder=h263 --enable-muxer=h263 --enable-demuxer=h263 \ --enable-libmp3lame --enable-encoder=libmp3lame \ --extra-ldflags="-L$MP3LAME_HOME/libmp3lame/.libs -L$X264_HOME" --extra-cflags="-I$MP3LAME_HOME/include -I$X264_HOME" \ --disable-debug \ @@ -93,6 +97,8 @@ Note: mingw64-make failed to work (segmentation fault) that's why we fallback to --disable-network \ --enable-libx264 --enable-gpl --enable-parser=h264 --enable-encoder=libx264 \ --enable-decoder=h264 --enable-muxer=h264 --enable-demuxer=h264 \ + --enable-parser=h263 --enable-encoder=h263p \ + --enable-decoder=h263 --enable-muxer=h263 --enable-demuxer=h263 \ --enable-decoder=mjpeg --enable-muxer=mjpeg --enable-demuxer=mjpeg --enable-parser=mjpeg \ --enable-libmp3lame --enable-encoder=libmp3lame \ --extra-ldflags="-L$MP3LAME_HOME/libmp3lame/.libs -L$X264_HOME" --extra-cflags="-I$MP3LAME_HOME/include -I$X264_HOME" \ @@ -103,7 +109,8 @@ Note: mingw64-make failed to work (segmentation fault) that's why we fallback to - Mac OS X Note: removed from configure script the option to add -mdynamic-no-pic unless you compile - for i386 architecture (intel 32-bit). + for i386 architecture (intel 32-bit). For i386, remove "--enable-pic" from the following + command. ./configure \ --enable-pic \ @@ -113,6 +120,8 @@ Note: mingw64-make failed to work (segmentation fault) that's why we fallback to --disable-network \ --enable-libx264 --enable-gpl --enable-parser=h264 --enable-encoder=libx264 \ --enable-decoder=h264 --enable-muxer=h264 --enable-demuxer=h264 \ + --enable-parser=h263 --enable-encoder=h263p \ + --enable-decoder=h263 --enable-muxer=h263 --enable-demuxer=h263 \ --enable-libmp3lame --enable-encoder=libmp3lame \ --extra-ldflags="-fPIC -L$MP3LAME_HOME/libmp3lame/.libs -L$X264_HOME" --extra-cflags="-fPIC -I$MP3LAME_HOME/include -I$X264_HOME" \ --disable-debug \ diff --git a/src/native/ffmpeg/ffmpeg-23181.diff b/src/native/ffmpeg/ffmpeg-23181.diff index 664c093..5f9ecea 100644 --- a/src/native/ffmpeg/ffmpeg-23181.diff +++ b/src/native/ffmpeg/ffmpeg-23181.diff @@ -70,4 +70,26 @@ Index: libavcodec/libx264.c + return 0; } + +Index: libavcodec/ituh263enc.c +=================================================================== +--- libavcodec/ituh263enc.c (révision 23181) ++++ libavcodec/ituh263enc.c (copie de travail) +@@ -162,7 +162,7 @@ + + put_bits(&s->pb, 3, 7); + put_bits(&s->pb,3,ufep); /* Update Full Extended PTYPE */ +- if (format == 7) ++ if (format == 8) + put_bits(&s->pb,3,6); /* Custom Source Format */ + else + put_bits(&s->pb, 3, format); +@@ -192,7 +192,7 @@ + /* This should be here if PLUSPTYPE */ + put_bits(&s->pb, 1, 0); /* Continuous Presence Multipoint mode: off */ + +- if (format == 7) { ++ if (format == 8) { + /* Custom Picture Format (CPFMT) */ + s->aspect_ratio_info= ff_h263_aspect_to_info(s->avctx->sample_aspect_ratio); |