Compare text

Find the difference between two text files

Real-time diff

Unified diff

Collapse lines

Highlight change

Syntax highlighting

Tools

Untitled diff

Created 9 years agoDiff never expires

37 removals

40 lines

38 additions

40 lines

built on Feb 15 2015 13:34:42 with gcc 4.9.2 (Gentoo 4.9.2 p1.1, pie-0.6.2)

built on Feb 12 2015 09:11:11 with gcc 4.9.2 (GCC) 20150204 (prerelease)

configuration: --prefix=/usr --libdir=/usr/lib64 --shlibdir=/usr/lib64 --mandir=/usr/share/man --enable-shared --cc=x86_64-pc-linux-gnu-gcc --cxx=x86_64-pc-linux-gnu-g++ --ar=x86_64-pc-linux-gnu-ar --optflags='-march=native -O2 -pipe' --extra-cflags='-march=native -O2 -pipe' --extra-cxxflags='-march=native -O2 -pipe' --disable-static --enable-gpl --enable-postproc --enable-avfilter --enable-avresample --disable-stripping --enable-nonfree --enable-version3 --enable-version3 --disable-indev=oss --disable-indev=jack --disable-outdev=oss --enable-bzlib --enable-runtime-cpudetect --disable-debug --disable-doc --disable-gnutls --enable-hardcoded-tables --enable-iconv --disable-lzma --enable-network --enable-openssl --enable-libsmbclient --enable-ffplay --disable-vaapi --enable-vdpau --enable-xlib --enable-libxcb --enable-libxcb-shm --enable-libxcb-xfixes --enable-zlib --enable-libvo-aacenc --disable-libvo-amrwbenc --enable-libmp3lame --disable-libaacplus --disable-libfaac --enable-libtheora --disable-libtwolame --disable-libwavpack --disable-libwebp --enable-libx264 --enable-libx265 --enable-libxvid --disable-libcdio --disable-libiec61883 --disable-libdc1394 --disable-libcaca --disable-openal --enable-opengl --disable-libv4l2 --enable-libpulse --enable-x11grab --disable-libbs2b --disable-libflite --disable-frei0r --disable-libfribidi --enable-fontconfig --disable-ladspa --enable-libass --enable-libfreetype --disable-libsoxr --enable-pthreads --disable-libopencore-amrwb --disable-libopencore-amrnb --disable-libfdk-aac --disable-libopenjpeg --enable-libbluray --disable-libcelt --disable-libgme --enable-libgsm --disable-libmodplug --disable-libopus --disable-libquvi --enable-librtmp --disable-libssh --enable-libschroedinger --enable-libspeex --enable-libvorbis --enable-libvpx --disable-libzvbi --disable-armv5te --disable-armv6 --disable-armv6t2 --disable-neon --disable-vfp --disable-mips32r2 --disable-mipsdspr1 --disable-mipsdspr2 --disable-mipsfpu --disable-altivec --disable-amd3dnow --disable-amd3dnowext --disable-avx2 --disable-fma3 --disable-fma4 --disable-mmxext --disable-sse3 --disable-xop --enable-pic --cpu=host

configuration: --prefix=/usr --disable-debug --disable-static --disable-stripping --enable-avisynth --enable-avresample --enable-fontconfig --enable-gnutls --enable-gpl --enable-libass --enable-libbluray --enable-libfreetype --enable-libfribidi --enable-libgsm --enable-libmodplug --enable-libmp3lame --enable-libopencore_amrnb --enable-libopencore_amrwb --enable-libopenjpeg --enable-libopus --enable-libpulse --enable-librtmp --enable-libschroedinger --enable-libspeex --enable-libtheora --enable-libv4l2 --enable-libvorbis --enable-libvpx --enable-libx264 --enable-libx265 --enable-libxvid --enable-runtime-cpudetect --enable-shared --enable-swresample --enable-vdpau --enable-version3 --enable-x11grab

libavutil 54. 15.100 / 54. 15.100

libavcodec 56. 13.100 / 56. 13.100

libavformat 56. 15.102 / 56. 15.102

libavdevice 56. 3.100 / 56. 3.100

libavfilter 5. 2.103 / 5. 2.103

libavresample 2. 1. 0 / 2. 1. 0

libswscale 3. 1.101 / 3. 1.101

libswresample 1. 1.100 / 1. 1.100

libpostproc 53. 3.100 / 53. 3.100

Input #0, x11grab, from ':0':

Input #0, x11grab, from ':0.0':

Duration: N/A, start: 1424036745.434868, bitrate: N/A

Duration: N/A, start: 1423996308.402791, bitrate: N/A

Stream #0:0: Video: rawvideo (BGRA / 0x41524742), bgra, 1920x1080, 60 fps, 60 tbr, 1000k tbn, 60 tbc

No pixel format specified, yuv444p for H.264 encoding chosen.

Use -pix_fmt yuv420p for compatibility with outdated media players.

[libx264 @ 0x20260a0] using cpu capabilities: MMX2 SSE2Fast SSSE3 SSE4.2 AVX

[libx264 @ 0x7fe1a4927420] using cpu capabilities: MMX2 SSE2Fast SSSE3 SSE4.2 AVX

[libx264 @ 0x20260a0] profile High 4:4:4 Predictive, level 4.2, 4:4:4 8-bit

[libx264 @ 0x7fe1a4927420] profile High 4:4:4 Predictive, level 4.2, 4:4:4 8-bit

[libx264 @ 0x20260a0] 264 - core 142 - H.264/MPEG-4 AVC codec - Copyleft 2003-2014 - http://www.videolan.org/x264.html - options: cabac=0 ref=1 deblock=0:0:0 analyse=0:0 me=dia subme=0 psy=1 psy_rd=1.00:0.00 mixed_ref=0 me_range=16 chroma_me=1 trellis=0 8x8dct=0 cqm=0 deadzone=21,11 fast_pskip=1 chroma_qp_offset=6 threads=12 lookahead_threads=2 sliced_threads=0 nr=0 decimate=1 interlaced=0 bluray_compat=0 constrained_intra=0 bframes=0 weightp=0 keyint=250 keyint_min=25 scenecut=0 intra_refresh=0 rc=crf mbtree=0 crf=23.0 qcomp=0.60 qpmin=0 qpmax=69 qpstep=4 ip_ratio=1.40 aq=0

[libx264 @ 0x7fe1a4927420] 264 - core 142 r2455 021c0dc - H.264/MPEG-4 AVC codec - Copyleft 2003-2014 - http://www.videolan.org/x264.html - options: cabac=0 ref=1 deblock=0:0:0 analyse=0:0 me=dia subme=0 psy=1 psy_rd=1.00:0.00 mixed_ref=0 me_range=16 chroma_me=1 trellis=0 8x8dct=0 cqm=0 deadzone=21,11 fast_pskip=1 chroma_qp_offset=6 threads=12 lookahead_threads=2 sliced_threads=0 nr=0 decimate=1 interlaced=0 bluray_compat=0 constrained_intra=0 bframes=0 weightp=0 keyint=250 keyint_min=25 scenecut=0 intra_refresh=0 rc=crf mbtree=0 crf=23.0 qcomp=0.60 qpmin=0 qpmax=69 qpstep=4 ip_ratio=1.40 aq=0

Output #0, matroska, to 'output.mkv':

Metadata:

encoder : Lavf56.15.102

Stream #0:0: Video: h264 (libx264) (H264 / 0x34363248), yuv444p, 1920x1080, q=-1--1, 60 fps, 1k tbn, 60 tbc

Metadata:

encoder : Lavc56.13.100 libx264

Stream mapping:

Stream #0:0 -> #0:0 (rawvideo (native) -> h264 (libx264))

Press [q] to stop, [?] for help

frame= 52 fps= 19 q=-1.0 Lsize= 593kB time=00:00:00.86 bitrate=5602.7kbits/s

frame= 504 fps= 63 q=-1.0 Lsize= 1943kB time=00:00:08.40 bitrate=1894.6kbits/s

video:592kB audio:0kB subtitle:0kB other streams:0kB global headers:0kB muxing overhead: 0.164468%

video:1939kB audio:0kB subtitle:0kB other streams:0kB global headers:0kB muxing overhead: 0.191385%

[libx264 @ 0x20260a0] frame I:1 Avg QP:20.00 size:433364

[libx264 @ 0x7fe1a4927420] frame I:3 Avg QP:15.33 size:569592

[libx264 @ 0x20260a0] frame P:51 Avg QP:16.12 size: 3377

[libx264 @ 0x7fe1a4927420] frame P:501 Avg QP:15.38 size: 551

[libx264 @ 0x20260a0] mb I I16..4: 100.0% 0.0% 0.0%

[libx264 @ 0x7fe1a4927420] mb I I16..4: 100.0% 0.0% 0.0%

[libx264 @ 0x20260a0] mb P I16..4: 0.0% 0.0% 0.0% P16..4: 3.7% 0.0% 0.0% 0.0% 0.0% skip:96.2%

[libx264 @ 0x7fe1a4927420] mb P I16..4: 0.0% 0.0% 0.0% P16..4: 0.4% 0.0% 0.0% 0.0% 0.0% skip:99.5%

[libx264 @ 0x20260a0] coded y,u,v intra: 60.5% 20.1% 12.0% inter: 1.3% 0.6% 0.4%

[libx264 @ 0x7fe1a4927420] coded y,u,v intra: 61.4% 38.4% 27.9% inter: 0.2% 0.1% 0.0%

[libx264 @ 0x20260a0] i16 v,h,dc,p: 54% 26% 11% 8%

[libx264 @ 0x7fe1a4927420] i16 v,h,dc,p: 50% 30% 11% 8%

[libx264 @ 0x20260a0] kb/s:5590.25

[libx264 @ 0x7fe1a4927420] kb/s:1890.41

Received signal 2: terminating.

Saved diffs

Original text

Open file

ffmpeg version 2.5.3 Copyright (c) 2000-2015 the FFmpeg developers
  built on Feb 15 2015 13:34:42 with gcc 4.9.2 (Gentoo 4.9.2 p1.1, pie-0.6.2)
  configuration: --prefix=/usr --libdir=/usr/lib64 --shlibdir=/usr/lib64 --mandir=/usr/share/man --enable-shared --cc=x86_64-pc-linux-gnu-gcc --cxx=x86_64-pc-linux-gnu-g++ --ar=x86_64-pc-linux-gnu-ar --optflags='-march=native -O2 -pipe' --extra-cflags='-march=native -O2 -pipe' --extra-cxxflags='-march=native -O2 -pipe' --disable-static --enable-gpl --enable-postproc --enable-avfilter --enable-avresample --disable-stripping --enable-nonfree --enable-version3 --enable-version3 --disable-indev=oss --disable-indev=jack --disable-outdev=oss --enable-bzlib --enable-runtime-cpudetect --disable-debug --disable-doc --disable-gnutls --enable-hardcoded-tables --enable-iconv --disable-lzma --enable-network --enable-openssl --enable-libsmbclient --enable-ffplay --disable-vaapi --enable-vdpau --enable-xlib --enable-libxcb --enable-libxcb-shm --enable-libxcb-xfixes --enable-zlib --enable-libvo-aacenc --disable-libvo-amrwbenc --enable-libmp3lame --disable-libaacplus --disable-libfaac --enable-libtheora --disable-libtwolame --disable-libwavpack --disable-libwebp --enable-libx264 --enable-libx265 --enable-libxvid --disable-libcdio --disable-libiec61883 --disable-libdc1394 --disable-libcaca --disable-openal --enable-opengl --disable-libv4l2 --enable-libpulse --enable-x11grab --disable-libbs2b --disable-libflite --disable-frei0r --disable-libfribidi --enable-fontconfig --disable-ladspa --enable-libass --enable-libfreetype --disable-libsoxr --enable-pthreads --disable-libopencore-amrwb --disable-libopencore-amrnb --disable-libfdk-aac --disable-libopenjpeg --enable-libbluray --disable-libcelt --disable-libgme --enable-libgsm --disable-libmodplug --disable-libopus --disable-libquvi --enable-librtmp --disable-libssh --enable-libschroedinger --enable-libspeex --enable-libvorbis --enable-libvpx --disable-libzvbi --disable-armv5te --disable-armv6 --disable-armv6t2 --disable-neon --disable-vfp --disable-mips32r2 --disable-mipsdspr1 --disable-mipsdspr2 --disable-mipsfpu --disable-altivec --disable-amd3dnow --disable-amd3dnowext --disable-avx2 --disable-fma3 --disable-fma4 --disable-mmxext --disable-sse3 --disable-xop --enable-pic --cpu=host
  libavutil      54. 15.100 / 54. 15.100
  libavcodec     56. 13.100 / 56. 13.100
  libavformat    56. 15.102 / 56. 15.102
  libavdevice    56.  3.100 / 56.  3.100
  libavfilter     5.  2.103 /  5.  2.103
  libavresample   2.  1.  0 /  2.  1.  0
  libswscale      3.  1.101 /  3.  1.101
  libswresample   1.  1.100 /  1.  1.100
  libpostproc    53.  3.100 / 53.  3.100
Input #0, x11grab, from ':0':
  Duration: N/A, start: 1424036745.434868, bitrate: N/A
    Stream #0:0: Video: rawvideo (BGRA / 0x41524742), bgra, 1920x1080, 60 fps, 60 tbr, 1000k tbn, 60 tbc
No pixel format specified, yuv444p for H.264 encoding chosen.
Use -pix_fmt yuv420p for compatibility with outdated media players.
[libx264 @ 0x20260a0] using cpu capabilities: MMX2 SSE2Fast SSSE3 SSE4.2 AVX
[libx264 @ 0x20260a0] profile High 4:4:4 Predictive, level 4.2, 4:4:4 8-bit
[libx264 @ 0x20260a0] 264 - core 142 - H.264/MPEG-4 AVC codec - Copyleft 2003-2014 - http://www.videolan.org/x264.html - options: cabac=0 ref=1 deblock=0:0:0 analyse=0:0 me=dia subme=0 psy=1 psy_rd=1.00:0.00 mixed_ref=0 me_range=16 chroma_me=1 trellis=0 8x8dct=0 cqm=0 deadzone=21,11 fast_pskip=1 chroma_qp_offset=6 threads=12 lookahead_threads=2 sliced_threads=0 nr=0 decimate=1 interlaced=0 bluray_compat=0 constrained_intra=0 bframes=0 weightp=0 keyint=250 keyint_min=25 scenecut=0 intra_refresh=0 rc=crf mbtree=0 crf=23.0 qcomp=0.60 qpmin=0 qpmax=69 qpstep=4 ip_ratio=1.40 aq=0
Output #0, matroska, to 'output.mkv':
  Metadata:
    encoder         : Lavf56.15.102
    Stream #0:0: Video: h264 (libx264) (H264 / 0x34363248), yuv444p, 1920x1080, q=-1--1, 60 fps, 1k tbn, 60 tbc
    Metadata:
      encoder         : Lavc56.13.100 libx264
Stream mapping:
  Stream #0:0 -> #0:0 (rawvideo (native) -> h264 (libx264))
Press [q] to stop, [?] for help
frame=   52 fps= 19 q=-1.0 Lsize=     593kB time=00:00:00.86 bitrate=5602.7kbits/s    
video:592kB audio:0kB subtitle:0kB other streams:0kB global headers:0kB muxing overhead: 0.164468%
[libx264 @ 0x20260a0] frame I:1     Avg QP:20.00  size:433364
[libx264 @ 0x20260a0] frame P:51    Avg QP:16.12  size:  3377
[libx264 @ 0x20260a0] mb I  I16..4: 100.0%  0.0%  0.0%
[libx264 @ 0x20260a0] mb P  I16..4:  0.0%  0.0%  0.0%  P16..4:  3.7%  0.0%  0.0%  0.0%  0.0%    skip:96.2%
[libx264 @ 0x20260a0] coded y,u,v intra: 60.5% 20.1% 12.0% inter: 1.3% 0.6% 0.4%
[libx264 @ 0x20260a0] i16 v,h,dc,p: 54% 26% 11%  8%
[libx264 @ 0x20260a0] kb/s:5590.25
Received signal 2: terminating.

Changed text

Open file

ffmpeg version 2.5.3 Copyright (c) 2000-2015 the FFmpeg developers
  built on Feb 12 2015 09:11:11 with gcc 4.9.2 (GCC) 20150204 (prerelease)
  configuration: --prefix=/usr --disable-debug --disable-static --disable-stripping --enable-avisynth --enable-avresample --enable-fontconfig --enable-gnutls --enable-gpl --enable-libass --enable-libbluray --enable-libfreetype --enable-libfribidi --enable-libgsm --enable-libmodplug --enable-libmp3lame --enable-libopencore_amrnb --enable-libopencore_amrwb --enable-libopenjpeg --enable-libopus --enable-libpulse --enable-librtmp --enable-libschroedinger --enable-libspeex --enable-libtheora --enable-libv4l2 --enable-libvorbis --enable-libvpx --enable-libx264 --enable-libx265 --enable-libxvid --enable-runtime-cpudetect --enable-shared --enable-swresample --enable-vdpau --enable-version3 --enable-x11grab
  libavutil      54. 15.100 / 54. 15.100
  libavcodec     56. 13.100 / 56. 13.100
  libavformat    56. 15.102 / 56. 15.102
  libavdevice    56.  3.100 / 56.  3.100
  libavfilter     5.  2.103 /  5.  2.103
  libavresample   2.  1.  0 /  2.  1.  0
  libswscale      3.  1.101 /  3.  1.101
  libswresample   1.  1.100 /  1.  1.100
  libpostproc    53.  3.100 / 53.  3.100
Input #0, x11grab, from ':0.0':
  Duration: N/A, start: 1423996308.402791, bitrate: N/A
    Stream #0:0: Video: rawvideo (BGRA / 0x41524742), bgra, 1920x1080, 60 fps, 60 tbr, 1000k tbn, 60 tbc
No pixel format specified, yuv444p for H.264 encoding chosen.
Use -pix_fmt yuv420p for compatibility with outdated media players.
[libx264 @ 0x7fe1a4927420] using cpu capabilities: MMX2 SSE2Fast SSSE3 SSE4.2 AVX
[libx264 @ 0x7fe1a4927420] profile High 4:4:4 Predictive, level 4.2, 4:4:4 8-bit
[libx264 @ 0x7fe1a4927420] 264 - core 142 r2455 021c0dc - H.264/MPEG-4 AVC codec - Copyleft 2003-2014 - http://www.videolan.org/x264.html - options: cabac=0 ref=1 deblock=0:0:0 analyse=0:0 me=dia subme=0 psy=1 psy_rd=1.00:0.00 mixed_ref=0 me_range=16 chroma_me=1 trellis=0 8x8dct=0 cqm=0 deadzone=21,11 fast_pskip=1 chroma_qp_offset=6 threads=12 lookahead_threads=2 sliced_threads=0 nr=0 decimate=1 interlaced=0 bluray_compat=0 constrained_intra=0 bframes=0 weightp=0 keyint=250 keyint_min=25 scenecut=0 intra_refresh=0 rc=crf mbtree=0 crf=23.0 qcomp=0.60 qpmin=0 qpmax=69 qpstep=4 ip_ratio=1.40 aq=0
Output #0, matroska, to 'output.mkv':
  Metadata:
    encoder         : Lavf56.15.102
    Stream #0:0: Video: h264 (libx264) (H264 / 0x34363248), yuv444p, 1920x1080, q=-1--1, 60 fps, 1k tbn, 60 tbc
    Metadata:
      encoder         : Lavc56.13.100 libx264
Stream mapping:
  Stream #0:0 -> #0:0 (rawvideo (native) -> h264 (libx264))
Press [q] to stop, [?] for help
frame=  504 fps= 63 q=-1.0 Lsize=    1943kB time=00:00:08.40 bitrate=1894.6kbits/s    
video:1939kB audio:0kB subtitle:0kB other streams:0kB global headers:0kB muxing overhead: 0.191385%
[libx264 @ 0x7fe1a4927420] frame I:3     Avg QP:15.33  size:569592
[libx264 @ 0x7fe1a4927420] frame P:501   Avg QP:15.38  size:   551
[libx264 @ 0x7fe1a4927420] mb I  I16..4: 100.0%  0.0%  0.0%
[libx264 @ 0x7fe1a4927420] mb P  I16..4:  0.0%  0.0%  0.0%  P16..4:  0.4%  0.0%  0.0%  0.0%  0.0%    skip:99.5%
[libx264 @ 0x7fe1a4927420] coded y,u,v intra: 61.4% 38.4% 27.9% inter: 0.2% 0.1% 0.0%
[libx264 @ 0x7fe1a4927420] i16 v,h,dc,p: 50% 30% 11%  8%
[libx264 @ 0x7fe1a4927420] kb/s:1890.41
Received signal 2: terminating.